Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
84,585 Commits 36 Branches 189 Tags
71e22ee11b04f70e3b51b10cf4d9cd84b2877832
Commit Graph

7833 Commits

Author SHA1 Message Date
Laurent Destailleur
fc31680bd0 Several fix for chart.js graphs 2020-03-05 02:55:06 +01:00
Laurent Destailleur
74fa8d90e7 Use status of member colors into pie chart 2020-03-05 01:38:41 +01:00
Laurent Destailleur
a98b65ad99 FIX #13274 cannot add or update 0 value for an int or double extrafield 
type
 2020-03-05 00:43:51 +01:00
Laurent Destailleur
aa1552dbc0 Enhance graphs 2020-03-05 00:17:16 +01:00
Laurent Destailleur
d0839350db NEW Move engine to build charts from jflot to chart.js 2020-03-04 23:30:41 +01:00
Laurent Destailleur
2b6aaa652d Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency 
NEW: add multicurrency columns to document lists
 2020-03-03 23:12:53 +01:00
Laurent Destailleur
760afd6838 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-02 23:28:12 +01:00
Laurent Destailleur
481ea6296e No more need fo this constant. Use the generic default feature instead 2020-03-02 23:28:01 +01:00
Laurent Destailleur
55093f9ff2 Merge pull request #13232 from TobiasSekan/NewCategoriesInStocks 
NEW Category filter for warehouse list
 2020-03-02 22:50:08 +01:00
Laurent Destailleur
6d01aee2f2 Merge pull request #13246 from Dolibarr/11.0 
Can process lang files with windows format (even if all lang files must have linux format)
 2020-03-02 21:46:27 +01:00
Sekan, Tobias
f325c63055 Merge branch 'NewCategoriesInStocks' of https://github.com/TobiasSekan/dolibarr into NewCategoriesInStocks 2020-03-01 14:50:27 +01:00
Sekan, Tobias
754058b990 Fix lint errors 2020-03-01 14:50:22 +01:00
stickler-ci
a6b2531fd0 Fixing style errors. 2020-03-01 13:46:49 +00:00
Sekan, Tobias
0e55495c3e adress feedback 2020-03-01 14:45:51 +01:00
Laurent Destailleur
bb5b55f9e3 Merge pull request #13225 from prietojc/patch-13 
Update translate.class.php
 2020-02-29 12:58:32 +01:00
Laurent Destailleur
00483e4e85 NEW Add hook getInputIdProf. Better solution for #13228 2020-02-29 12:32:27 +01:00
Laurent Destailleur
dea8525a6c NEW X-Axis on graph are show vertical when there is a lot of values. 2020-02-29 01:26:24 +01:00
Laurent Destailleur
f0d458682d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-29 00:15:17 +01:00
Laurent Destailleur
e35bba358f Fix error when generating documents 2020-02-29 00:13:42 +01:00
Laurent Destailleur
bfb9739ae8 Fix manufacuring efficiency on bom lines. 2020-02-28 16:12:42 +01:00
Laurent Destailleur
e07a29ecd0 Fix class not found 2020-02-27 22:02:45 +01:00
Laurent Destailleur
2d841d9d83 Debug multilang website 2020-02-27 21:43:11 +01:00
Laurent Destailleur
a3e56994b6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/admin/company.php
	htdocs/compta/tva/document.php
	htdocs/core/lib/files.lib.php
	htdocs/main.inc.php
 2020-02-27 18:35:32 +01:00
Laurent Destailleur
baaa6b797b FIX SQl syntax error 2020-02-27 17:51:31 +01:00
Laurent Destailleur
a0b465e8ae Fix sql error 2020-02-27 17:43:59 +01:00
Laurent Destailleur
eac07aceb0 Responsive 2020-02-27 16:00:01 +01:00
Marc de Lima Lucio
6d728f12ba NEW: invoice list: enable multicurrency columns 2020-02-27 14:10:00 +01:00
JC Prieto
c555a2c588 Update translate.class.php 
Resolve bug #9105
When load() function loads translation file from an external modules, adds a \r simbol at the end of each line.
 2020-02-27 09:32:22 +01:00
Laurent Destailleur
9bc5eb44ca FIX #13182 2020-02-26 20:25:26 +01:00
Laurent Destailleur
0646b1a7a9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
 2020-02-26 17:04:14 +01:00
Laurent Destailleur
ab01acfe53 Merge pull request #13211 from ATM-Marc/FIX_11.0_excess_paid_from_situation_invoice 
FIX: excess paid from situation invoices not counted when calculating remain to pay
 2020-02-26 16:30:20 +01:00
Laurent Destailleur
b52cfe58d6 FIX Disable js if no javascript 2020-02-26 15:45:12 +01:00
Laurent Destailleur
35e886fb12 FIX Disable js if no javascript 2020-02-26 15:22:23 +01:00
Marc de Lima Lucio
d3b70994fe Merge branch 'FIX_8.0_excess_paid_from_situation_invoice' of github.com:ATM-Marc/dolibarr into FIX_11.0_excess_paid_from_situation_invoice 2020-02-26 10:42:55 +01:00
Marc de Lima Lucio
373ab3bc01 FIX: excess paid from situation invoices not counted when calculating remain to pay 2020-02-26 10:35:43 +01:00
Laurent Destailleur
b7b2d3562b Merge pull request #13195 from oscim/patch-24 
Update commonobject.class.php
 2020-02-26 05:14:27 +01:00
Laurent Destailleur
59137f0f47 Merge pull request #13190 from oscim/patch-23 
Update commonobject.class.php
 2020-02-25 12:05:22 +01:00
ATM john
c216b7cae5 fix title padding definition source 2020-02-24 22:34:34 +01:00
ATM john
7b6faf7063 Merge branch '12.0_new_allow_extrafields_on_pdf_extend_to_line_desc' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc 2020-02-24 22:16:10 +01:00
ATM john
9c1fdf1c52 Fix missing php doc 2020-02-24 22:12:36 +01:00
stickler-ci
5a77716b93 Fixing style errors. 2020-02-24 21:10:14 +00:00
ATM john
3e492b8a5b Fix title padding 2020-02-24 22:08:04 +01:00
ATM john
ae890d021c Fix comments 2020-02-24 21:50:01 +01:00
ATM john
7f2dd19bb0 Fix pdf cell padding for model cyan, erathosthene, espadon, cornas 2020-02-24 21:43:33 +01:00
stickler-ci
6de74e774e Fixing style errors. 2020-02-24 19:50:07 +00:00
ATM john
3c4e7f7b07 Fix cell padding sponge 2020-02-24 20:47:19 +01:00
oscim
65f3e5466e Update commonobject.class.php 
add path class for support type project or projet in element_element
 2020-02-24 17:51:11 +01:00
stickler-ci
d07e2ab8fb Fixing style errors. 2020-02-24 16:44:46 +00:00
oscim
fe4bd46c43 Update commonobject.class.php 
add support of contact linkedobject
 2020-02-24 17:28:25 +01:00
Tobias Sekan
7baba2ba43 Add line number substitution 2020-02-24 14:55:02 +01:00