Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
55,188 Commits 36 Branches 189 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

55188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Regis Houssin
5de88f6af1 Fix: increase max-width when use externals modules 2016-09-08 10:09:14 +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
Laurent Destailleur
dc1bc33343 sql syntax 2016-09-02 21:48:02 +02:00
Laurent Destailleur
e19743519b FIX #5660 2016-09-02 21:44:52 +02:00
Laurent Destailleur
78b2e9e4bf FIX #5651 2016-09-02 21:40:07 +02:00
Laurent Destailleur
8c4324d912 FIX #5674 2016-09-02 21:15:48 +02:00
Laurent Destailleur
dc9c2f0ed7 FIX #5687 2016-09-02 21:10:46 +02:00
Laurent Destailleur
4fa94e3a25 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-02 19:25:04 +02:00
Laurent Destailleur
ba76f12a28 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/product/price.php
	htdocs/product/stock/class/mouvementstock.class.php
 2016-09-02 19:24:28 +02:00
Laurent Destailleur
9c8145eb88 Better fix for 416a0892d7 2016-09-02 19:19:13 +02:00
Laurent Destailleur
696b54c6c3 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-02 19:03:50 +02:00
Laurent Destailleur
70de814c3c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-02 19:03:31 +02:00
Laurent Destailleur
f4ada7f18e Merge pull request #5695 from fappels/4.0_delete_product_lot 
FIX Delete product_lot data when product deleted
 2016-09-02 18:44:21 +02:00
Laurent Destailleur
5c2af9b7bd Merge pull request #5694 from atm-ph/fix_3.8_address_empty 
Fix lost value if use double quote
 2016-09-02 18:42:32 +02:00
Laurent Destailleur
d6a4b58a68 Merge pull request #5685 from atm-gauthier/3.8_fix_header_title_commercial_area 
FIX : header title in commercial area
 2016-09-02 18:36:47 +02:00
Laurent Destailleur
570c228ee1 Merge pull request #5692 from fmarcet/3.9 
Fix: An empty variable is used to update multiprice
 2016-09-02 18:24:09 +02:00
Laurent Destailleur
5dc7c9c6e5 Merge pull request #5691 from fappels/3.9_fix_check_lot_dates 
FIX #5642 Ignore time when checking lot dates
 2016-09-02 18:23:04 +02:00
fappels
aedd813236 Delete product_lot when product deleted 2016-09-02 18:13:25 +02:00
phf
fcd5e1fb2c Fix lost value if use double quote 2016-09-02 15:30:42 +02:00