lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,303 Commits 43 Branches 150 Tags 886 MiB
b690306b70
Commit Graph

65303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TuxGasy
9eeb80151e Fix bug when updating multi currency rate on invoice supplier 2018-03-09 21:13:54 +01:00
Laurent Destailleur
143827ac79
Merge pull request #8306 from Robisix/7.0 
FIX Duplicate product_type asignement on order addline
 2018-03-09 19:45:47 +01:00
Laurent Destailleur
8f7122cf52
Merge pull request #8305 from atm-florian/7.0_fix 
fix warning and sql error
 2018-03-09 19:44:57 +01:00
florian HENRY
42fed5981d bettre syntax 2018-03-09 19:16:06 +01:00
florian HENRY
02beed265e better space 2018-03-09 19:14:43 +01:00
florian HENRY
5a56e802d9 FIX #8232 2018-03-09 19:10:52 +01:00
florian HENRY
f0164f2689 fix type date 2018-03-09 14:25:37 +01:00
florian HENRY
1c966d4769 on going 2018-03-09 12:57:58 +01:00
Romain DELVAL
ee55776886 FIX Duplicate product_type asignement on order addline 
On addline order method, ther is a duplicate assignation on
line->product_type before call to "insert" method.
The second assignement always make product_type to "0" while it was
fetched from product himsel like it was made on first asignement few
lines above
 2018-03-09 12:38:28 +01:00
florian HENRY
f37d482331 fix warning and sql error 2018-03-09 11:37:23 +01:00
atm-ph
53ce297ab3 Fix travis - missing documentation of new param 2018-03-09 09:30:11 +01:00
Laurent Destailleur
ad96229ec4 Fix not visible template selector for supplier order/invoice emails 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-03-08 20:52:25 +01:00
Laurent Destailleur
af9fff4f83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-08 16:35:12 +01:00
Laurent Destailleur
3762ed12c7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-03-08 16:33:51 +01:00
Laurent Destailleur
6d0c4deb6e
Merge pull request #8295 from ATM-Marc/FIX_product_photo_ecm 
FIX: warning when adding ECM files using old photo path
 2018-03-08 16:24:42 +01:00
Laurent Destailleur
343ca1bc77
Merge pull request #8294 from hregis/7.0_bug5 
Fix: avoid conflict between invoice and invoicenumber sharings
 2018-03-08 16:24:05 +01:00
Laurent Destailleur
7a7c4b8f14 Fix invalid url 2018-03-08 14:41:13 +01:00
Laurent Destailleur
d8dcebfa9a FIX Do not lose filter when editing comment of a time spent in task view 2018-03-07 20:12:40 +01:00
Laurent Destailleur
cab61724f2 Fix phpcs 2018-03-07 19:40:06 +01:00
Laurent Destailleur
317a5f5b2f Fix by adding a redirect to avoid the order2billing being done twice. 2018-03-07 19:15:23 +01:00
Laurent Destailleur
78259db0ee Intorduce dolDecodeBlockedData 2018-03-07 19:14:48 +01:00
Laurent Destailleur
69ef6a9316 Fix data on thirdparty tooltip 2018-03-07 19:13:54 +01:00
Laurent Destailleur
c02e8e9831 Css 2018-03-07 19:13:15 +01:00
Marc de Lima Lucio
884b74a6bb FIX: warning when adding ECM files using old photo path 2018-03-07 17:12:59 +01:00
Laurent Destailleur
acc29ea163 FIX #8219 2018-03-07 16:19:13 +01:00
Laurent Destailleur
f4f009d877 FIX #8269 2018-03-07 16:10:40 +01:00
Laurent Destailleur
eeb5b4b206 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 15:53:12 +01:00
Laurent Destailleur
b2f6105ae2 FIX #8277 2018-03-07 15:52:58 +01:00
Regis Houssin
a0774d523d Fix: avoid conflict between invoice and invoicenumber sharings 2018-03-07 15:24:23 +01:00
Laurent Destailleur
64e59c3f97
Merge pull request #8292 from hregis/7.0_bug6 
Fix: avoid error if type is not numeric
 2018-03-07 13:08:31 +01:00
Laurent Destailleur
f8d8c5c658 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:04:27 +01:00
Laurent Destailleur
004839b368 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
Laurent Destailleur
8b9041b93e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-07 13:02:18 +01:00
Laurent Destailleur
4caefbe926 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-03-07 12:59:52 +01:00
Laurent Destailleur
94de6efa4b
Merge pull request #8291 from ATM-Marc/FIX_order_export_date_livraison 
FIX: add planned delivery to order exports
 2018-03-07 12:59:32 +01:00
Laurent Destailleur
3284ebdcf1
Merge pull request #8290 from atm-alexis/6.0_fix_natural_search_double_space 
FIX natural search double quote
 2018-03-07 12:56:37 +01:00
Laurent Destailleur
e518303e1b
Merge pull request #8288 from atm-florian/7.0_fix_comment_task 
FIX comment on tasks
 2018-03-07 12:40:31 +01:00
Laurent Destailleur
f7f9f0e605
Update comment.php 2018-03-07 12:40:09 +01:00
Laurent Destailleur
ee1a2c49fd
Merge pull request #8287 from hregis/7.0_bug3 
Fix: problem to see users with transverse mode
 2018-03-07 12:38:00 +01:00
Regis Houssin
0f574579eb Fix: avoid error if type is not numeric 2018-03-07 12:27:13 +01:00
Laurent Destailleur
2053cc9307
Merge pull request #8284 from hregis/7.0_bug5 
Fix: wrong entity id, always value 1 !
 2018-03-07 12:19:09 +01:00
Marc de Lima Lucio
dd208348c4 FIX: add planned delivery to order exports 2018-03-07 12:18:08 +01:00
alexis Algoud
cb27eb98e1 FIX natural search double quote 2018-03-07 11:42:47 +01:00
Laurent Destailleur
a0a9e12178 Fix css 2018-03-07 11:29:50 +01:00
Laurent Destailleur
f3fd5f4cfa FIX Label of event show twice 2018-03-07 11:03:35 +01:00
florian HENRY
6cb77577a6 can use image 2018-03-07 09:03:13 +01:00
florian HENRY
bb73a715a8 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix_comment_task 2018-03-07 08:49:08 +01:00
florian HENRY
03873038d5 fix comment task 2018-03-07 08:47:34 +01:00
Laurent Destailleur
23a4a60970 Fix status of task 2018-03-06 21:51:43 +01:00
Laurent Destailleur
0dfc9af72a FIX multicompany compatibility and fix reports 2018-03-06 19:58:13 +01:00