Laurent Destailleur
|
3aaf9dae11
|
Fix parameter to cal cron method
|
2017-02-27 00:12:48 +01:00 |
|
Laurent Destailleur
|
29578a38bd
|
Keep previous behaviour if new option not set
|
2017-02-24 16:19:00 +01:00 |
|
Laurent Destailleur
|
7ee6dc7fa6
|
Merge pull request #6388 from atm-ph/new_deposit_with_multi_tva_management
New deposit with multi tva management
|
2017-02-24 16:16:33 +01:00 |
|
Laurent Destailleur
|
d72e5a3646
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-10 17:34:23 +01:00 |
|
Laurent Destailleur
|
66542b6367
|
Fix translation and link to direct debit payment
|
2017-02-10 10:43:54 +01:00 |
|
phf
|
579d350599
|
Fix keep the standard behaviour
|
2017-02-09 17:41:06 +01:00 |
|
Laurent Destailleur
|
e1a6e6e4ab
|
Rename "attributes" into "variants" to avoid confusion with extrafields
|
2017-02-08 12:37:38 +01:00 |
|
Laurent Destailleur
|
b24f244f67
|
Merge pull request #5533 from marcosgdf/prod-attr
Feature Request: NEW Added product attributes feature
|
2017-02-08 11:20:33 +01:00 |
|
Laurent Destailleur
|
b611c5ca53
|
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
NEW Develop new reduc on excess received
|
2017-02-08 11:16:10 +01:00 |
|
phf
|
6b20bad847
|
add fixme
|
2017-02-07 11:14:27 +01:00 |
|
phf
|
0f421dc2b4
|
New global conf MAIN_DEPOSIT_MULTI_TVA to manage multi tva on deposit
|
2017-02-07 11:09:18 +01:00 |
|
Marcos García de La Fuente
|
d06fb423c0
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
|
2017-02-02 20:07:41 +01:00 |
|
Laurent Destailleur
|
c3fb559d3b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modProduct.class.php
|
2017-02-01 20:58:17 +01:00 |
|
Laurent Destailleur
|
24c21cca27
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-01-28 15:56:27 +01:00 |
|
Laurent Destailleur
|
4f76626f51
|
FIX Creation of credit note on invoice with deposit stole the discount.
|
2017-01-28 15:55:44 +01:00 |
|
Laurent Destailleur
|
39151d7a74
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-22 12:14:18 +01:00 |
|
Laurent Destailleur
|
65f7de8f64
|
Fix css and look 5.0
|
2017-01-22 12:13:32 +01:00 |
|
Laurent Destailleur
|
ea97491a8f
|
Merge pull request #6288 from marcosgdf/fr-6280
NEW #6280: Generate PDF after creating an invoice from a customer order
|
2017-01-20 18:11:47 +01:00 |
|
Laurent Destailleur
|
2f4ff66c43
|
Minor fixes
|
2017-01-20 14:10:57 +01:00 |
|
Marcos García de La Fuente
|
6dbb3efc89
|
NEW #6280: Generate PDF after creating an invoice from a customer order
Close #6280
|
2017-01-16 20:24:26 +01:00 |
|
Marcos García de La Fuente
|
d09a3628c5
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/compta/facture.php
|
2017-01-14 23:59:14 +01:00 |
|
Laurent Destailleur
|
f07c741176
|
Fix missing error message on invoice creation
|
2017-01-02 11:31:21 +01:00 |
|
Laurent Destailleur
|
b642a3a602
|
Prepare release 5.0
|
2016-12-31 16:35:56 +01:00 |
|
Marcos García de La Fuente
|
47a444b2ab
|
Merge branch 'develop' into prod-attr
|
2016-12-27 15:54:53 +01:00 |
|
Laurent Destailleur
|
003045525f
|
Fix css
|
2016-12-27 01:32:29 +01:00 |
|
Laurent Destailleur
|
3e28f22bad
|
Fix style
|
2016-12-27 00:08:43 +01:00 |
|
Marcos García de La Fuente
|
5669f734b8
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-12-24 21:39:40 +01:00 |
|
phf
|
cca7967144
|
Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin
|
2016-12-15 16:19:54 +01:00 |
|
phf
|
21a648a052
|
Fix user right on margin module to write buyprice
|
2016-12-15 12:01:46 +01:00 |
|
Laurent Destailleur
|
2dcb97e61d
|
Continue work on dol_banner
|
2016-12-11 13:16:21 +01:00 |
|
Maxime Kohlhaas
|
177ec97689
|
Actualize currency on propal, order and invoice
|
2016-12-11 01:04:58 +01:00 |
|
Maxime Kohlhaas
|
d426ab04f0
|
Multicurrency on proposal and order
|
2016-12-11 00:42:52 +01:00 |
|
Maxime Kohlhaas
|
7c82b18da0
|
New : allow to actualize currency rate
|
2016-12-10 22:07:25 +01:00 |
|
Maxime Kohlhaas
|
6474591e25
|
Allow to enter price in currency
|
2016-12-10 19:54:16 +01:00 |
|
gauthier
|
ef721bebc6
|
FIX : break with no iteration
|
2016-12-09 17:48:03 +01:00 |
|
fappels
|
b918d7abc9
|
fix travis
|
2016-12-05 19:20:46 +01:00 |
|
fappels
|
7776ae6da4
|
Fix travis
|
2016-12-05 19:19:48 +01:00 |
|
Laurent Destailleur
|
4b831537e5
|
Fix several problem in notes management of template invoices.
|
2016-12-04 21:27:08 +01:00 |
|
gauthier
|
d8aa572ad7
|
FIX : fetch discount desappeared in develop...
|
2016-11-28 17:38:20 +01:00 |
|
gauthier
|
34a123759f
|
Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received
|
2016-11-28 17:13:35 +01:00 |
|
gauthier
|
9a1309256d
|
Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received
|
2016-11-28 17:13:09 +01:00 |
|
gauthier
|
3f6f1ac86f
|
fix : where fk_facture = object id
|
2016-11-28 17:12:17 +01:00 |
|
Laurent Destailleur
|
e59edca855
|
Fix Responsive design
|
2016-11-27 20:55:59 +01:00 |
|
Marcos García de La Fuente
|
cf0ee36150
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-11-27 18:10:01 +01:00 |
|
gauthier
|
c433829d27
|
NEW : interface
|
2016-11-25 11:04:42 +01:00 |
|
gauthier
|
480b08bd0b
|
NEW : convert exceiss received to reduc
|
2016-11-24 15:48:04 +01:00 |
|
Marcos García de La Fuente
|
286095f5cd
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
|
2016-11-06 15:01:40 +01:00 |
|
BENKE Charlie
|
85c57e76e0
|
Update facture.php
|
2016-11-05 11:01:38 +01:00 |
|
aspangaro
|
efd24e5922
|
Work on supplier credit note
|
2016-10-29 07:45:24 +02:00 |
|
Laurent Destailleur
|
33a7b7037d
|
Save information of vat code into database
|
2016-10-24 03:23:40 +02:00 |
|