Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
96,016 Commits 36 Branches 189 Tags
0127a3bedb51f05f32f11c23fe9a2398ad1c7e21
Commit Graph

5507 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
dvdwalker
d4d7e85805 Update modProduct.class.php 2020-10-30 08:19:28 -03:00
Laurent Destailleur
ec0c8e0c79 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:35:40 +01:00
Laurent Destailleur
263b679af4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:31:04 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-28 16:49:52 +00:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-27 18:46:07 +00:00
Laurent Destailleur
ec6c735d89 Clean code 2020-10-27 19:44:15 +01:00
Laurent Destailleur
f7de9333bb Doxygen 2020-10-27 19:29:42 +01:00
Alfredo Altamirano
1b82b6af4d FIX #15111 Fix special characters output in PDF 2020-10-25 22:17:02 -06:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Laurent Destailleur
4d9c8e2225 Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
dvdwalker
8b91b5527a Update to allow importing extrafileds on Product Supplier Price 2020-10-24 11:13:44 -03:00
Frédéric FRANCE
96e80f116a fix unknown property db 2020-10-23 22:06:23 +02:00
Frédéric FRANCE
ae3228b9e0 retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
a83131276d Merge pull request #15079 from FHenry/dev_addtranslationkeyPDFInvoiceSituation 
new: add PDFInvoiceSituation translation key for PDF title
 2020-10-22 15:49:25 +02:00
Laurent Destailleur
bf6ec35478 Merge pull request #15095 from joseplluis/patch-9 
FIX input name in MRP mask const
 2020-10-22 15:45:36 +02:00
Josep Lluís
1221cc854d FIX input name in MRP mask const 
input name in MRP mask const was wrong
 2020-10-22 15:23:45 +02:00
Frédéric FRANCE
f500076247 remove warning 2020-10-21 21:21:30 +02:00
Frédéric FRANCE
4873794dc0 doxygen 2020-10-21 21:08:33 +02:00
Frédéric FRANCE
06325f9422 doxygen 2020-10-21 21:00:50 +02:00
Frédéric FRANCE
81f6a7abb6 can add a driver for printing in module 2020-10-21 20:18:06 +02:00
Florian HENRY
d347af385b new: add PDFInvoiceSituation translation key for PDF title 2020-10-21 13:47:40 +02:00
Laurent Destailleur
e3552e7e02 Clean code 2020-10-16 20:17:54 +02:00
jove@bisquerra.com
f90b236e0f Change the tag char for security reasons in 'Receipt Printer' module 2020-10-15 23:44:13 +02:00
Laurent Destailleur
64b1a31e45 Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType 
NEW : Nature of product is now a dictionay
 2020-10-15 21:07:42 +02:00
Laurent Destailleur
a1913995df Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2020-10-15 21:00:49 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 20:38:32 +02:00
ATM john
b9cbd84d4e Fix page break 2020-10-15 09:30:48 +02:00
Florian HENRY
109d1ab801 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-15 08:25:46 +02:00
Laurent Destailleur
0908ac5867 Fix phpcs 2020-10-14 20:18:07 +02:00
Florian HENRY
7d09f22afa add correct import and dict edition 2020-10-14 16:39:42 +02:00
Laurent Destailleur
4a3a3190ea Standardize pdf templates 2020-10-14 01:46:49 +02:00
Laurent Destailleur
75997bb8f5 Minor fixes 2020-10-12 14:01:15 +02:00
Laurent Destailleur
726fd1b631 Merge pull request #11227 from aspangaro/10.0_intracommreport 
NEW module Intracomm report
 2020-10-12 13:35:58 +02:00
Laurent Destailleur
a1dd922394 Update modProduct.class.php 2020-10-12 13:04:10 +02:00
Florian HENRY
cea6eb279f add immport packaging supplier quantity 2020-10-12 11:26:09 +02:00
Laurent Destailleur
b36b9170b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-10 15:45:22 +02:00
Laurent Destailleur
437eead694 Fix bad permission 2020-10-10 15:45:04 +02:00
Philippe GRAND
ba674d09d3 add some translations 2020-10-10 14:45:58 +02:00
Philippe GRAND
094dbc1265 add some translations 2020-10-10 14:38:57 +02:00
Philippe GRAND
37b6a43c5c add some translations 2020-10-10 14:30:22 +02:00
Alexandre SPANGARO
b3b37dd9ee Fix sticklerCI 2020-10-09 09:32:50 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Laurent Destailleur
0628c92bdb Merge pull request #14960 from rabib-metroworks/import-po 
NEW ADDED IMPORT TOOL FOR PO
 2020-10-08 19:29:53 +02:00
Aurélien
b6283c1a5d Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
quentin
77552c6508 Merge branch 'NEW_helper_functions' of github.com:atm-quentin/dolibarr into NEW_helper_functions 2020-10-08 10:50:08 +02:00
quentin
7591ec6cf6 FIX style 2020-10-08 10:49:29 +02:00