Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
101,561 Commits 36 Branches 189 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

5891 Commits

Author SHA1 Message Date
Laurent Destailleur
47c5bf5f06 Fix example 2020-08-29 04:22:57 +02:00
FlorianMortgat
c25463a4ba + more parentheses around expression for readability 2020-08-28 21:07:11 +02:00
FlorianMortgat
173ad057f9 + parentheses around expression for readability 2020-08-28 20:46:35 +02:00
Florian Mortgat
7ddf85cd33 Merge branch '11.0' into 11.0_FIX_11858_do_not_allow_lines_to_overlap_infotot 2020-08-28 10:05:00 +02:00
Florian Mortgat
a5d1f1f68f FIX: expenses lines overlapping the frame for total amounts. 
If there is no room for this frame when printing the last expense line, this line should be on a new page.
 2020-08-28 10:02:43 +02:00
Laurent Destailleur
f4793f505e Merge pull request #14532 from StephaneLesage/import-thirdparty-mothercompany-debtlimit-bank-incoterms 
NEW Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
 2020-08-27 20:12:36 +02:00
Laurent Destailleur
b6e9ba8ed6 Merge pull request #14535 from aspangaro/13a6 
Some fix on assets
 2020-08-27 20:01:33 +02:00
Alexandre SPANGARO
eebe888377 Some fix on assets 2020-08-24 09:47:37 +02:00
stickler-ci
721b1275ff Fixing style errors. 2020-08-23 23:20:07 +00:00
StephaneLesage
5aac080e61 NEW Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms 2020-08-24 01:01:35 +02:00
Laurent Destailleur
2b8a1570f9 Merge pull request #14512 from StephaneLesage/import-product-warehouse-usebatch 
NEW: Products Import/Export 'default warehouse' and 'use batch' fields
 2020-08-23 18:19:59 +02:00
Laurent Destailleur
34d2d9a7c6 Look and feel v13 2020-08-23 15:17:22 +02:00
Laurent Destailleur
23cda5f464 Enhance recruitment module 2020-08-22 14:37:09 +02:00
Laurent Destailleur
dabe804299 Add numbering modules for candidatures. Mass action Validate. 2020-08-22 03:49:46 +02:00
Laurent Destailleur
f4ed84f27d Trans 2020-08-21 22:18:02 +02:00
Laurent Destailleur
a508e7ae08 Migration 2020-08-21 22:17:20 +02:00
Laurent Destailleur
1b22de5652 Fix phpcs 2020-08-21 13:22:49 +02:00
Laurent Destailleur
220fc6db98 Work on recruitment module 2020-08-21 13:00:12 +02:00
Laurent Destailleur
461c37c4a8 Clean code 2020-08-21 01:28:40 +02:00
Laurent Destailleur
eb15a8e4db Enhance email collector module 2020-08-20 23:03:57 +02:00
Laurent Destailleur
3ebcd191bd NEW Add filter rules "is answer" and "is not answer" in email collector 2020-08-20 20:16:38 +02:00
Laurent Destailleur
66f9f37f41 Minor code and doc enhancement 2020-08-20 19:00:43 +02:00
StephaneLesage
ad6fe8c6b6 NEW: Products Import/Export 'default warehouse' and 'use batch number' fields 2020-08-20 13:51:17 +02:00
Laurent Destailleur
2f18ab0ea9 Debug generation of document for warehouse 2020-08-18 14:55:56 +02:00
Laurent Destailleur
964c4ef0d2 Standardize code. Use model_pdf. 2020-08-18 14:48:38 +02:00
Laurent Destailleur
58e25768a7 NEW Add PDF document templates for warehouses (list of stock) 2020-08-18 14:02:36 +02:00
Laurent Destailleur
d1323f55bb NEW: Module Reception (for a more accurate management of your 
receptions) moved from experimental to stable
 2020-08-17 14:10:43 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Philippe Grand
e7bea7c5ce Update pdf_cyan.modules.php 2020-08-08 15:34:38 +02:00
Philippe GRAND
fe24c2f8b8 fix undefined variable 2020-08-08 15:29:53 +02:00
Philippe GRAND
f35893ceb4 fix deprecated 2020-08-08 15:12:29 +02:00
Philippe GRAND
0603a3ef60 fix conflict 2020-08-08 15:00:13 +02:00
Philippe GRAND
d811934962 fix conflict 2020-08-08 14:57:43 +02:00
Laurent Destailleur
cab9f6daae Comment must be in english 2020-08-08 13:22:55 +02:00
Laurent Destailleur
0dda5ca4d6 Fix experimental 2020-08-07 16:27:09 +02:00
Laurent Destailleur
aa422ce4d7 Merge branch 'develop' into develop 2020-08-07 12:05:32 +02:00
Laurent Destailleur
d8e38201d9 Merge pull request #14378 from grandoc/patch-5 
Update pdf_crabe.modules.php
 2020-08-07 11:42:12 +02:00
Laurent Destailleur
a2e4e2d3b2 Merge pull request #14380 from grandoc/patch-6 
Update pdf_blochet.class.php
 2020-08-07 11:41:44 +02:00
Laurent Destailleur
9320ba1b37 Merge pull request #14376 from grandoc/patch-3 
Update pdf_rouget.modules.php
 2020-08-07 11:41:28 +02:00
Laurent Destailleur
07564166c7 Merge pull request #14375 from grandoc/patch-2 
Update pdf_merou.modules.php
 2020-08-07 10:11:16 +02:00
Laurent Destailleur
84c80e50a0 Merge pull request #14374 from grandoc/patch-1 
Update pdf_ban.modules.php
 2020-08-07 10:10:58 +02:00
Laurent Destailleur
8b69dd1384 Increase length of default password. 2020-08-07 09:50:15 +02:00
Laurent Destailleur
9d79e984dd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
 2020-08-06 02:15:04 +02:00
Laurent Destailleur
2fd430bd2c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 02:08:44 +02:00
Laurent Destailleur
375fe3f3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/fourn/paiement/card.php
 2020-08-06 02:08:04 +02:00
Laurent Destailleur
9cb5735165 FIX Bad address used for vendor on PDF standard of supplier payment 2020-08-06 02:05:55 +02:00
Laurent Destailleur
1cf3422e05 FIX Bad adress of vendor in PDF for PDF of supplier payment 
FIX dol_convertToWord() Bad conversion of number into a string
 2020-08-06 01:56:42 +02:00
Philippe Grand
eed8957e07 Update pdf_blochet.class.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:33:52 +02:00
Philippe Grand
8d2edfc5ab Update pdf_crabe.modules.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:13:08 +02:00
Philippe Grand
8483d4609c Update pdf_rouget.modules.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:05:32 +02:00