Commit Graph

55055 Commits

Author SHA1 Message Date
Laurent Destailleur
399addebfb FIX alignement of intervention status 2016-09-10 17:38:26 +02:00
Laurent Destailleur
530ae91e82 Fix missing information on main supplier proposal card, not on note tab. 2016-09-10 17:35:08 +02:00
Laurent Destailleur
9153400195 Merge pull request #5710 from fappels/4.0_debug_product_lot
FIX create shipment with lot and extrafield
2016-09-10 14:39:01 +02:00
Laurent Destailleur
3ecc82b770 Fix error message not reported 2016-09-10 13:00:31 +02:00
Laurent Destailleur
e10c89fba8 More log to help debug 2016-09-10 12:30:01 +02:00
Laurent Destailleur
8d3adfd1c9 Fix 2016-09-10 12:22:23 +02:00
Laurent Destailleur
41545e0d60 Fix compatibility of recurring invoices with postgresql 2016-09-10 05:26:31 +02:00
Laurent Destailleur
7c9996c840 Fix when creating recurring invoice, date next gen was not set 2016-09-10 05:25:07 +02:00
Laurent Destailleur
d821df070b Fix multicompany: recurring invoice must be in same env than template. 2016-09-10 04:33:23 +02:00
Laurent Destailleur
c28a62e051 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-10 02:59:10 +02:00
Laurent Destailleur
66cf9e333e Fix option MAIN_BUTTON_HIDE_UNAUTHORIZED 2016-09-10 02:58:46 +02:00
Juanjo Menent
d8f50f9acd Merge remote-tracking branch 'upstream/3.9' into 4.0
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2016-09-09 16:34:02 +02:00
Laurent Destailleur
efde12b489 Fix minor css 2016-09-09 09:21:27 +02:00
Juanjo Menent
e3c2299c67 Merge remote-tracking branch 'upstream/3.8' into 3.9
Conflicts:
	htdocs/admin/dict.php
	htdocs/fourn/class/fournisseur.commande.class.php
2016-09-08 18:52:44 +02:00
Laurent Destailleur
87165cd859 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-08 18:21:10 +02:00
Juanjo Menent
65ba409add Merge pull request #5724 from grandoc/4.0
fix : bad name
2016-09-08 18:17:39 +02:00
Laurent Destailleur
52801b13d9 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-08 18:16:50 +02:00
Juanjo Menent
ecfd3a0af5 Merge pull request #5722 from atm-ph/fix_4.0_multicurrency_rate_entity
Fix miss entity column in llx_multicurrency_rate
2016-09-08 18:16:21 +02:00
Juanjo Menent
fc8fe394db Merge pull request #5714 from aspangaro/4.0-p48
FIX: Problem of presentation with index supplier command
2016-09-08 18:13:47 +02:00
Laurent Destailleur
4fe4907b44 FIX Mandatory field payment term was not css highlighted. 2016-09-08 18:13:23 +02:00
Juanjo Menent
bdb55895fa Merge pull request #5713 from sanser/4.0
FIX: fileconf.php redundant else blocks
2016-09-08 18:11:44 +02:00
Juanjo Menent
ff632718fa Merge pull request #5719 from philippe-opendsi/3.8_patch_1
FIX #5705 Supplier Order's lines array initalisation
2016-09-08 18:06:25 +02:00
Juanjo Menent
b72794216e Merge pull request #5702 from simnandez/3.8
FIX: vat dictionary should allow enter and edit multiple values for localtaxes, separated by: (ex -19:-15)
2016-09-08 18:05:57 +02:00
Laurent Destailleur
c3bb4a89e4 Fix late satus on contract service line 2016-09-08 17:53:04 +02:00
Laurent Destailleur
417b2f566f FIX Translation of "Name" is not a good choice for floow-up. 2016-09-08 17:31:42 +02:00
philippe grand
6fd14128ba fix : bad name 2016-09-08 16:37:30 +02:00
phf
7229b572dc Default entity 1 in llx_multicurrency_rate 2016-09-08 14:59:16 +02:00
phf
7917169961 Fix miss entity column in llx_multicurrency_rate 2016-09-08 14:53:59 +02:00
Laurent Destailleur
71cef95dda FIX Execute a dedicated job from its id may results of launching other
jobs too.
2016-09-08 13:01:50 +02:00
Laurent Destailleur
9aa6c72a11 FIX Update of maxnbrun on job list failed. 2016-09-08 12:37:51 +02:00
Philippe
972a2db3a3 No initialisation of the array before filling it. May cause some trouble when fetch is call several times and lines added or deleted 2016-09-08 11:40:39 +02:00
Laurent Destailleur
9affdc0886 Prepare 4.0.1 2016-09-08 11:23:26 +02:00
Laurent Destailleur
35145b7426 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-08 11:15:16 +02:00
Laurent Destailleur
2b7ef01e42 FIX SEC for HTB23302 2016-09-08 11:09:38 +02:00
aspangaro
2b43eb934f Fix: Problem of presentation with index supplier command 2016-09-07 22:25:37 +02:00
Sergiu Sandu
02698c5abb fileconf.php redundant else statements
Is it ok the 2 else blocks are the same?
2016-09-07 17:02:41 +01:00
Juanjo Menent
7bce5a354f Merge pull request #5703 from hregis/4.0_bug
Fix: Warning: preg_match(): No ending delimiter '/' found
2016-09-07 16:58:00 +02:00
fappels
7c772b7608 Fix insert expeditiondet_batch with extrafield
Line id of extraflied was used iso expeditiondet
2016-09-07 14:07:29 +02:00
fappels
6574ebcbff Replace non existing ref parameter
Replace non existing ref parameter with product_id and batch to fetch a
specific batch from a product.
Remove unused sceleton methods.
2016-09-07 12:40:15 +02:00
fappels
2f73409360 Merge remote-tracking branch 'refs/remotes/Dolibarr/4.0' into 4.0_debug_product_lot 2016-09-07 12:37:38 +02:00
Regis Houssin
36110da4bf Fix: Warning: preg_match(): No ending delimiter '/' found 2016-09-06 17:22:56 +02:00
Juanjo Menent
3078e6fa4b FIX: vat dictionary should allow enter and edit multiple values for localtaxes, separated by: (ex -19:-15) 2016-09-06 13:44:07 +02:00
Juanjo Menent
d2ef56f3f1 Merge remote-tracking branch 'origin/3.9' into 3.9 2016-09-06 13:03:27 +02:00
Juanjo Menent
4e5105c220 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-09-06 13:03:01 +02:00
Laurent Destailleur
666c62af04 Fix http into https 2016-09-06 00:59:31 +02:00
Laurent Destailleur
e07f65721a Fix css 2016-09-06 00:58:37 +02:00
Laurent Destailleur
d4c35b7131 Fix bad translation 2016-09-04 23:45:14 +02:00
Laurent Destailleur
f440e78fa6 FIX quick search boxes when nojs or when using smartphone 2016-09-03 12:56:49 +02:00
Laurent Destailleur
acdce83f9c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/product/price.php
2016-09-02 22:37:01 +02:00
Laurent Destailleur
aab3b2837a FIX #5589 2016-09-02 22:34:37 +02:00