fappels
e75dea4f8d
Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0
2017-03-24 14:39:06 +01:00
Laurent Destailleur
b189e3e394
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-23 20:12:25 +01:00
Laurent Destailleur
be0d5bee78
Fix phpcs
2017-03-23 20:07:46 +01:00
Laurent Destailleur
2062047dea
Merge pull request #6555 from atm-gauthier/5.0_fix_originid_on_supplierorder
...
FIX : origin & origin id on supplier order line
2017-03-23 20:03:58 +01:00
Laurent Destailleur
32f05aa89f
Merge pull request #6554 from atm-gauthier/5.0_fix_units_on_supplierproposal
...
FIX : forgotten fk_unit field on llx_supplier_propaldet
2017-03-23 20:00:10 +01:00
Laurent Destailleur
6ab94ddbe7
Fix translation
2017-03-23 19:26:02 +01:00
Laurent Destailleur
c4b6378751
Fix english translation
2017-03-23 16:46:00 +01:00
Laurent Destailleur
7df9c25e60
Several fixes on multicurrency
2017-03-23 12:44:20 +01:00
gauthier
a790ef9f7c
FIX : origin & origin id on supplier order line
2017-03-23 12:35:43 +01:00
gauthier
0730f84cf6
FIX : param php doc
2017-03-23 12:14:09 +01:00
gauthier
6cecab4c92
FIX : forgottent fk_unit field on llx_supplier_propaldet
2017-03-22 16:43:12 +01:00
Laurent Destailleur
ee8112dde7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/projet/class/project.class.php
2017-03-21 19:20:14 +01:00
Laurent Destailleur
61031f1633
FIX Missing total on project overview.
2017-03-21 19:10:43 +01:00
Laurent Destailleur
e6637422d5
Fix with on smartphone
2017-03-21 17:58:41 +01:00
Laurent Destailleur
e7e51d9e4f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/projet/class/project.class.php
2017-03-21 17:19:30 +01:00
Laurent Destailleur
43e70830ed
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-03-21 17:18:41 +01:00
Laurent Destailleur
1e63b98731
Fix responsive
2017-03-21 17:06:27 +01:00
Laurent Destailleur
4457bc33cd
Fix english translation
2017-03-21 14:23:55 +01:00
Laurent Destailleur
e2e76b40da
FIX list of projects
...
Conflicts:
htdocs/core/boxes/box_project.php
2017-03-21 13:43:48 +01:00
Laurent Destailleur
36630b9404
FIX Picto of project on dol_banner and box
...
Conflicts:
htdocs/core/boxes/box_project.php
2017-03-21 13:43:05 +01:00
Laurent Destailleur
ea6daeb58b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-20 23:53:54 +01:00
Laurent Destailleur
80f7bce8d8
Fix duplicate <a>
2017-03-20 20:41:43 +01:00
Laurent Destailleur
ac19aba07e
FIX multicurrency management on supplier order/invoice
...
Conflicts:
htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
2017-03-19 15:41:55 +01:00
Laurent Destailleur
b7442a0c1a
Fix bad vat rate used into sql request
2017-03-19 15:38:07 +01:00
Laurent Destailleur
967f3f579d
Fix translation
2017-03-18 20:07:37 +01:00
Laurent Destailleur
5871d59db9
Fix error "Invalid default value for 'date_price'"
2017-03-18 15:25:49 +01:00
Laurent Destailleur
f7e71d1de2
FIX LOG_ERROR does not exists. Use LOG_ERR.
2017-03-18 11:48:02 +01:00
Laurent Destailleur
f0dddae6d1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-18 11:38:32 +01:00
Laurent Destailleur
597fb11d08
Fix error management in duplicate trigger
2017-03-18 11:36:48 +01:00
Laurent Destailleur
4d6b20b785
Merge pull request #6540 from laudeco/fix/mailMassAction
...
fix the from e-mail on mass action
2017-03-18 04:34:37 +01:00
Laurent Destailleur
1e3c287eee
Merge pull request #6539 from simnandez/5.0
...
FIX #6537 Bug: SQL error: Missing , leads to wrong syntax
2017-03-18 04:33:14 +01:00
Laurent Destailleur
9e545e9628
Merge pull request #6538 from hregis/4.0_bug3
...
FIX wrong user fetch when same login in different entity
2017-03-18 03:55:20 +01:00
Laurent Destailleur
ee23e8b3d1
Merge pull request #6532 from fappels/5.0_fix_fourn_commande_class
...
Fix fourn commande class
2017-03-18 03:19:50 +01:00
De Coninck Laurent
8c65c47b1f
fix the from e-mail on mass action
...
In mass action e-mail (like on facture), the from e-mail was not taken into account.
2017-03-17 17:55:25 +01:00
Juanjo Menent
5c028b30d5
Fix #6512 Bug: Invalid argument in when submitting orderstoinvoice.php-form
2017-03-17 17:05:59 +01:00
Juanjo Menent
f255b94e99
Fix #6537 Bug: SQL error: Missing , leads to wrong syntax
2017-03-17 16:10:40 +01:00
Regis Houssin
f03bdb91a4
Merge remote-tracking branch 'origin/4.0' into 4.0_bug3
2017-03-17 12:42:54 +01:00
Regis Houssin
9e944e4525
Fix: wrong user fetch when same login in different entity
2017-03-17 12:41:56 +01:00
Laurent Destailleur
dfc1ed7d72
FIX #6535
2017-03-16 22:49:02 +01:00
Laurent Destailleur
7dd0f14563
Fix link to reconciliated function
2017-03-16 21:03:35 +01:00
Laurent Destailleur
68d3a93027
Fix link to reconcile
2017-03-16 20:36:51 +01:00
Laurent Destailleur
0d6a99b35a
Fix space
2017-03-16 11:01:35 +01:00
Laurent Destailleur
68e50d0c79
FIX Filter on date lost after submit on time spent page
2017-03-16 10:36:17 +01:00
fappels
c1b21db407
Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0_fix_fourn_commande_class
2017-03-16 10:06:20 +01:00
fappels
f9c2bb0410
Fix create supplier order line label
...
Fix create line label
Fix read line rang, special_code and fk_parent_line
Remove create line rang, done by table default and $this->rang is
invalid, supplier order has no rang property.
2017-03-16 10:05:50 +01:00
Laurent Destailleur
deb91ad7c1
FIX Data lost during merge of thirdparties
2017-03-15 13:30:30 +01:00
Laurent Destailleur
6f25d6de24
Fix bad management of PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY
2017-03-15 12:33:06 +01:00
Laurent Destailleur
dc83dd45fe
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-15 00:04:35 +01:00
Laurent Destailleur
39c8f9a15a
Fix country not preselected
2017-03-15 00:04:09 +01:00
Laurent Destailleur
9827887643
Merge pull request #6519 from marcosgdf/bug-multiprices
...
FIX Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error
2017-03-14 10:45:47 +01:00
