lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,485 Commits 43 Branches 150 Tags 886 MiB
09558d0ce9
Commit Graph

87485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
09558d0ce9 Fix MAIN_OPTIMIZEFORTEXTBROWSER 2020-09-16 13:15:57 +02:00
Laurent Destailleur
40acd8a386 Fix missing field canvas 2020-09-16 12:17:33 +02:00
Laurent Destailleur
907a1b56e6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-16 02:55:35 +02:00
Laurent Destailleur
33d7e766b6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-16 02:55:25 +02:00
Laurent Destailleur
1344874e43 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-16 02:54:47 +02:00
Laurent Destailleur
e1d117b52d
Merge pull request #14735 from atm-florianm/10.0_FIX_prelevement_top5_multicompany 
FIX: missing entity check
 2020-09-16 01:21:39 +02:00
Laurent Destailleur
06a73539fe
Merge pull request #14731 from ATM-Consulting/12.0_FIX_round_virtual_stock_value_on_reassort_list 
FIX 12.0 - round value of virtual stock on product stock reassort list
 2020-09-16 01:12:34 +02:00
Laurent Destailleur
afc6155783 FIX sign of amount with credit note and multicurrencies 2020-09-15 13:30:59 +02:00
Florian Mortgat
06d31e8b9a FIX: missing entity check 2020-09-14 16:09:45 +02:00
Florian Mortgat
4c6b0ed5b5 FIX 12.0 - round value of virtual stock on product stock reassort list 2020-09-14 10:49:44 +02:00
Laurent Destailleur
701b83db38 FIX Bad number of subscription (forgotten when member was resiliated) 2020-09-14 02:38:12 +02:00
Laurent Destailleur
b2288ad2d9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-14 02:33:00 +02:00
Laurent Destailleur
a891211f78 Fix bad link 2020-09-14 02:32:30 +02:00
Laurent Destailleur
c40ec37b60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-14 02:13:43 +02:00
Laurent Destailleur
c3ba8f7843 Better translation 2020-09-14 02:13:27 +02:00
Laurent Destailleur
18b20a5587
Merge pull request #14721 from indelog/12.0 
Fix: getLabelOfUnit() for Product, CommonObjectline to print long label
 2020-09-14 00:16:38 +02:00
Laurent Destailleur
d0698735d6
Update product.class.php 2020-09-14 00:14:25 +02:00
Laurent Destailleur
0d9d9498e2
Update commonobjectline.class.php 2020-09-14 00:13:12 +02:00
Laurent Destailleur
a4fb16b4f3 Add a warning to warn about security leak 2020-09-14 00:03:49 +02:00
Laurent Destailleur
76fc8330a3 Fix for wampserver3_64 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2020-09-13 13:47:46 +02:00
DEMAREST Maxime (Indelog)
1c523abbd8 Fix: getLabelOfUnit() for Product, CommonObjectline to print long label 
Also add $type = 'code' for return unit code in form 'unitXX' (where XX
is the code of unit).

for get return like unitXX where XX is the code of unit
 2020-09-13 07:44:30 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
709542e27d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-12 04:26:00 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Laurent Destailleur
ae857e7008
Merge pull request #14673 from atm-john/11.0_fix_loadlang_cron 
FIX Cron load lang
 2020-09-12 01:32:17 +02:00
Laurent Destailleur
ec13d3811e
Merge pull request #14706 from aspangaro/12.0p9 
FIX - Accountancy balance Error SQL on entity
 2020-09-12 01:17:04 +02:00
Laurent Destailleur
d44952011f
Update balance.php 2020-09-12 01:16:02 +02:00
Laurent Destailleur
0bdd1c0c17
Merge pull request #14701 from ATM-Nicolas/fix_wrong_redirection 
FIX : Wrong redirection
 2020-09-12 01:13:46 +02:00
Laurent Destailleur
134369ada9
Merge pull request #14707 from aspangaro/10.0_p41 
FIX Problems on FEC format
 2020-09-12 01:11:18 +02:00
Laurent Destailleur
29a45c46d5
Merge pull request #14712 from indelog/12.0 
Fix: short label of unit in Product::getLabelOfUnit()
 2020-09-12 01:10:13 +02:00
DEMAREST Maxime (Indelog)
e41afeacf4 Fix: short label of unit in Product::getLabelOfUnit 2020-09-11 15:34:11 +02:00
Alexandre SPANGARO
8fc9b78b47 FIX Problems on FEC format 2020-09-11 06:55:03 +02:00
Alexandre SPANGARO
04329c38b3 FIX - Accountancy balance Error SQL on entity 2020-09-11 06:42:22 +02:00
Laurent Destailleur
05a2fc6186 Fix rate for tunisia 2020-09-10 19:40:03 +02:00
Laurent Destailleur
358f8357f9 FIX #14703 2020-09-10 18:25:38 +02:00
Laurent Destailleur
0cccaa7271 FIX look and feel v12 2020-09-10 18:02:49 +02:00
ATM-Nicolas
7944c21fe5 FIX : Wrong redirection 2020-09-10 12:32:12 +02:00
John Botella
59d5391c2a Add force reload param to load method 2020-09-10 10:41:16 +02:00
Laurent Destailleur
b517050e17
Merge pull request #14672 from ATM-Nicolas/fix_api_static_property 
FIX : Static property called as non static
 2020-09-09 14:55:22 +02:00
Laurent Destailleur
c3ac446cf2
Merge pull request #14674 from ATM-Consulting/12.0_FIX_stock_is_not_rounded_on_product_list 
FIX: round stock value on product list
 2020-09-09 14:54:42 +02:00
Laurent Destailleur
5c34b26f39 FIX Look and feel v12: First tab must be name of object 2020-09-09 13:57:35 +02:00
Florian Mortgat
4a60725f6c FIX: round stock value on product list 2020-09-08 16:42:41 +02:00
John Botella
87d9dfa009 remove useless comm 2020-09-08 16:17:11 +02:00
John Botella
5a0622c906 FIX cron load lang 2020-09-08 16:14:14 +02:00
ATM-Nicolas
6bd6b285fd FIX : Static property called as non static 2020-09-08 16:03:18 +02:00
Laurent Destailleur
e7e05f47ac Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-07 14:26:07 +02:00
Laurent Destailleur
ca6e57b2f7 FIX Filter in "billed" of orders was not saved 2020-09-07 14:25:50 +02:00
Laurent Destailleur
92e231e121
Merge pull request #14652 from atm-john/12.0_fix_lang_retained_warranty 
FIX: lang fr retained warranty
 2020-09-07 12:46:32 +02:00
John Botella
10d3405219 FIX: lang fr retained warranty 2020-09-07 12:21:00 +02:00
Laurent Destailleur
a2db403abe Fix phpcs 2020-09-04 22:44:31 +02:00