Commit Graph

303 Commits

Author SHA1 Message Date
Florian HENRY
db7478098a Add a real free numbering module for contract 2014-08-12 13:26:06 +02:00
Florian HENRY
eca9408c91 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-08-12 12:37:31 +02:00
fmarcet
67a7a210fd Fix: Optimieze Price by Customer 2014-08-01 16:17:31 +02:00
Juanjo Menent
268aabbacd Fix: Price by customer 2014-08-01 13:27:54 +02:00
Florian HENRY
cf63f1a40d Remane contract ref_ext to ref_supplier 2014-07-21 08:36:59 +02:00
Juanjo Menent
d02814192f Qual: More intuitive if contract ref_ext we say ref. customer
Visu: ref. customer is not required
2014-07-12 10:56:13 +02:00
Florian HENRY
33f293ae19 Use good translation 2014-07-11 16:12:31 +02:00
Florian HENRY
d2e17eb321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	ChangeLog
2014-07-11 16:09:01 +02:00
Florian HENRY
c7d31f4570 [ task #1204 ] Add ref_int contract field 2014-07-11 11:26:54 +02:00
Florian HENRY
02574a7af2 Fix Ajax combobox in Extrafeilds
Add Extrafield on contract
2014-07-05 11:17:50 +02:00
Laurent Destailleur
18848eaf74 Clean forms 2014-05-12 13:25:36 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new
product (Supplier orders now use same template than customer
orders/proposal/invoices).
2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46 New: Merge free product and predefined product area to enter new
product.
2014-05-05 14:30:08 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
9cadd882d2 Hide a column that is always 0. 2014-04-23 13:51:02 +02:00
Laurent Destailleur
1b85f83dbb Merge pull request #1466 from marcosgdf/minor
Minor style and translation corrections
2014-03-13 11:53:52 +01:00
Laurent Destailleur
ded5d47afc Fix: multilangs array was not loaded. 2014-03-12 01:21:18 +01:00
Marcos García de La Fuente
096a446b7f Changed style of contract creation form to the 3.5 style 2014-03-11 11:15:15 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
d9dc8de4e6 Fix: Badd error message 2014-03-02 15:58:02 +01:00
Laurent Destailleur
748d769140 Fix: [ bug #1280 ] service with not end of date was tagged as expired. 2014-03-02 15:50:26 +01:00
Laurent Destailleur
f7fe25e408 Uniformize code to prepare mass update 2014-02-27 10:37:23 +01:00
Laurent Destailleur
1ec53873f3 Fix: Missing date start and end when creating contracts 2014-01-28 15:28:23 +01:00
Laurent Destailleur
954cd74ffb Fix: Missing date start and end when creating contracts 2014-01-28 15:24:30 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
simnandez
035670dce3 Fix: Bad get of localtaxes into contracts add lines 2014-01-07 12:18:50 +01:00
simnandez
b8550bb985 Fix: Bad get of localtaxes into contracts add lines 2014-01-07 12:16:56 +01:00
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00
Raphaël Doursenaud
7945011955 Make AJAX new line form work again
FIXME: Factorize!
2013-11-19 17:54:36 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and
make some browsers crazy.
2013-11-17 23:25:25 +01:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Laurent Destailleur
384e3812eb Fix: W3C. No form into TR. 2013-07-31 11:41:25 +02:00
Laurent Destailleur
378842e05f Fix: Better error management 2013-07-31 11:27:56 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1 Fix: print of a function that already contains the print. 2013-07-27 14:10:57 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
869e877cb7 Qual: We must not concat currency symbol after a price, but use the
parameter currency of method price.
2013-06-17 11:58:55 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Florian Henry
8fb2b8fa12 Start normalize project module : create html.formprojet.class.php with
selec_project
2013-06-14 22:33:01 +02:00
Laurent Léonard
919a34787e Fix [ bug #895 ] Description is lost when adding a new predefined product to a contract 2013-05-26 16:30:22 +02:00
Laurent Destailleur
9ffbed07fe Fix: More consistent fix 2013-05-25 18:16:13 +02:00
Florian Henry
8656a9f417 Fix [ bug #895 ] Description is lost when adding a new predefined
product to a contract
2013-05-25 16:50:55 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
76910d4159 Look: Start to use div to render actions buttons 2013-04-03 18:37:54 +02:00
eldy
c8d6e9e44a Fix: List of customers to build invoice or order 2013-03-23 12:33:25 +01:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
3defd294cb Merge remote-tracking branch 'origin/3.3' into develop 2013-03-07 11:08:15 +01:00
Laurent Destailleur
d5822b7fbd Fix: Syntax sql error when adding/editing line of contract and when
company does not use vat.
2013-03-05 18:13:27 +01:00