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

5393 Commits

Author SHA1 Message Date
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
stickler-ci
f5b34370b6 Fixing style errors. 2020-10-08 08:34:40 +00:00
quentin
fe8d7f7f1b missing public parameter 2020-10-08 10:32:16 +02:00
quentin
bf97d2a50f NEW helper functions for export with phpspreadsheet 2020-10-08 10:26:30 +02:00
Ahmad Jamaly Rabib
40e16cc840 NEW ADDED IMPORT TOOL FOR PO 
Added Purchase Order import functionality
 2020-10-08 00:34:53 +06:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
3ace9f638a Clean code 2020-10-07 13:20:38 +02:00
Laurent Destailleur
33fe5eb85f Fix sql request 2020-10-07 12:53:17 +02:00
Laurent Destailleur
e369610538 Fix 2020-10-07 12:48:05 +02:00
Laurent Destailleur
59e89fd53a Fix 2020-10-07 12:42:41 +02:00
Laurent Destailleur
145b1e97ca Fix sql 2020-10-07 12:41:25 +02:00
Laurent Destailleur
f16a58a62c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSocialNetworks.class.php
 2020-10-06 23:36:15 +02:00
Laurent Destailleur
04f8de4188 Remove dependency 2020-10-06 17:59:31 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Aurélien
f954e8b173
:mod livraison rename user acces right #14697 2020-10-06 16:10:48 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697 2020-10-06 13:32:02 +02:00
Aurélien
140200213e
change table into DB and ref #14697 2020-10-06 11:04:31 +02:00
Frédéric FRANCE
005cc093b9
fix typo 2020-10-05 20:02:23 +02:00
Laurent Destailleur
23f1137c84
Merge pull request #14920 from rabib-metroworks/import-vendor-invoice 
NEW Can import Supplier invoice
 2020-10-05 16:44:49 +02:00
Aurélien
bdd095f6bb
translate livraison2delivery => change folder, filename and class ref into all dependencies #14697 2020-10-05 13:59:59 +02:00
Ahmad Jamaly Rabib
4a6000c750 NEW ADDED IMPORT TOOL FOR CUSTOMER ORDER 
Added Order import functionality in import module
 2020-10-05 16:39:26 +06:00
Laurent Destailleur
8a079cf716 Code comment 2020-10-05 09:31:12 +02:00
Ahmad Jamaly Rabib
66a1aa9a86 NEW ADDED IMPORT TOOL FOR SUPPLIER INVOICE 
Added supplier invoice import functionality in import module
 2020-10-05 00:39:35 +06:00
Laurent Destailleur
03ede71989 Clean code 2020-10-02 16:15:24 +02:00
Laurent Destailleur
580df3d503
Merge pull request #14880 from rabib-metroworks/import-proposal 
NEW Can import proposals
 2020-10-01 19:09:14 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
91f0429bd2 Fix mention for france, only for FR country 2020-10-01 09:34:10 +02:00
Ahmad Jamaly Rabib
0b35a07290 NEW ADDED IMPORT TOOL FOR PROPOSAL MODULE 
Added proposal import functionality in import module
 2020-10-01 11:52:56 +06:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
Laurent Destailleur
1f8f2c0cc3 NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr 2020-09-29 13:13:47 +02:00
Laurent Destailleur
bd11154bfc NEW Can filter on accounting system ref in export of chart of account 2020-09-28 18:56:53 +02:00
Laurent Destailleur
4cf6e483ca Fix export of various payments. 2020-09-28 18:49:20 +02:00
Alexandre SPANGARO
88772726d7 New Add export for various payment 2020-09-28 09:32:49 +02:00
stickler-ci
f6513b898d Fixing style errors. 2020-09-23 13:37:35 +00:00
John Botella
a374ffd03a Merge branch '13.0_new_pdf_storm_for_delivery' of github.com:atm-john/dolibarr into 13.0_new_pdf_storm_for_delivery 2020-09-23 15:35:37 +02:00
John Botella
4a65b23bbf Fix missing fetch optionals 2020-09-23 15:35:17 +02:00
stickler-ci
9cc87e8a0c Fixing style errors. 2020-09-23 13:23:19 +00:00
John Botella
d3c9a035e9 Add new PDF model storm for delivery 2020-09-23 15:18:53 +02:00
Laurent Destailleur
e4bd75dbdc Enhancement for #14589 2020-09-22 16:26:53 +02:00
Laurent Destailleur
4ce7507518 Fix warnings 2020-09-20 17:06:53 +02:00
Laurent Destailleur
fa86b62198 Fix escaping 2020-09-20 01:53:24 +02:00
Laurent Destailleur
b5703350da Fix escape 2020-09-19 22:41:05 +02:00
Laurent Destailleur
54c0f742b1 Fix escape 2020-09-19 21:19:04 +02:00
Laurent Destailleur
534846c5c7 NEW Framework is ready for CSRF token protection on explicit GET URLs. 2020-09-18 04:30:24 +02:00
Laurent Destailleur
0f0e4feeaf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2020-09-17 19:33:29 +02:00
Laurent Destailleur
e123a4cb84 Fix help on minimum nb of chars 2020-09-17 15:09:29 +02:00
Laurent Destailleur
8029b80f08 Fix install hangs 2020-09-17 13:03:34 +02:00
Laurent Destailleur
004ba33695 Fix cach call of useNPR() 2020-09-17 10:11:06 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
40acd8a386 Fix missing field canvas 2020-09-16 12:17:33 +02:00
Laurent Destailleur
5c31593d43 Add date of birth in candidatures 2020-09-16 00:47:44 +02:00
Laurent Destailleur
cc37f4b29c Clean code. <input name="token" value="$_SESSION['newtoken']" is now 
forbidden by CI. You must use newToken().
 2020-09-14 16:24:02 +02:00
Scrutinizer Auto-Fixer
73915d51c8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-14 02:30:04 +00:00
Laurent Destailleur
1bdd4cae9b
Merge pull request #14699 from atm-adrien/NEW_add_widget_empty_tasks 
New add widget empty tasks
 2020-09-12 01:18:50 +02:00
Adrien Raze
c9833c501d SQL + insertion champs dans box 2020-09-10 11:10:06 +02:00
Laurent Destailleur
6ec89afe8b Fix phpcs 2020-09-10 03:30:24 +02:00
Laurent Destailleur
b99192bdb2
Update pdf_standard.class.php 2020-09-09 14:46:42 +02:00
stickler-ci
221c54c16f Fixing style errors. 2020-09-09 12:46:25 +00:00
Laurent Destailleur
4b783d203e
Update pdf_standard.class.php 2020-09-09 14:44:09 +02:00
Laurent Destailleur
229aa14a97
Update pdf_standard.class.php 2020-09-09 14:43:24 +02:00
bahfir abbes
f08c91fcc6 fix: replace values of __YEAR__, __MONTH__ and __DAY__ in member docs 2020-09-09 09:29:19 +01:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Laurent Destailleur
b1e45aef46 Debug opensurvey. Look and feel v13. Removed deprecated properties. 2020-09-07 12:04:50 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
77d15c9382 Fix long name overlap date 2020-09-03 11:34:20 +02:00
Laurent Destailleur
1eaba7d889 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-29 05:13:48 +02:00
Laurent Destailleur
f8bd7946a5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-08-29 05:13:20 +02:00
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
Philippe Grand
7e519da8df
Update pdf_merou.modules.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:00:59 +02:00
Philippe Grand
e368de9bba
Update pdf_ban.modules.php 2020-08-04 16:55:47 +02:00
Philippe Grand
bc86518020
Update pdf_aurore.modules.php 2020-08-04 16:13:35 +02:00
Philippe Grand
6a24aed42a
Update pdf_standard.modules.php 2020-08-04 16:12:21 +02:00
Philippe Grand
c6b4c4392c
Update pdf_muscadet.modules.php 2020-08-04 16:11:25 +02:00
Philippe Grand
79be00f0aa
Update pdf_cornas.modules.php 2020-08-04 16:10:06 +02:00
Philippe Grand
62c49b2ce3
Update pdf_canelle.modules.php 2020-08-04 16:08:43 +02:00
Philippe Grand
49c99cfa70
Update pdf_squille.modules.php 2020-08-04 16:07:21 +02:00
Philippe Grand
4d1743ffcf
Update pdf_cyan.modules.php 2020-08-04 16:06:01 +02:00
Philippe Grand
f4a4444c79
Update pdf_azur.modules.php 2020-08-04 16:04:54 +02:00
Philippe Grand
54878e2916
Update pdf_timespent.modules.php 2020-08-04 16:03:28 +02:00
Philippe Grand
d9c260c7f1
Update pdf_beluga.modules.php 2020-08-04 16:02:19 +02:00
Philippe Grand
81b484ecc8
Update pdf_baleine.modules.php 2020-08-04 16:01:28 +02:00
Philippe Grand
d781a7cf62
Update pdf_espadon.modules.php 2020-08-04 16:00:12 +02:00
Philippe Grand
e8f92fe5bc
Update pdf_standard.class.php 2020-08-04 15:59:23 +02:00
Philippe Grand
6937efa3ba
Update pdf_typhon.modules.php 2020-08-04 15:57:25 +02:00
Philippe Grand
ea72d5dc82
Update pdf_soleil.modules.php 2020-08-04 15:56:17 +02:00
Philippe Grand
51cbbcd3b8
Update pdf_sponge.modules.php 2020-08-04 15:55:14 +02:00
Philippe Grand
d97a9c9b0d
Update pdf_crabe.modules.php 2020-08-04 15:53:20 +02:00
Philippe Grand
85879a0baa
Update pdf_standard.modules.php 2020-08-04 15:51:35 +02:00
Philippe Grand
001662af3d
Update pdf_rouget.modules.php 2020-08-04 15:49:47 +02:00
Philippe Grand
19fb6e827e
Update pdf_merou.modules.php 2020-08-04 15:47:00 +02:00
Philippe Grand
f94d4413a9
Update pdf_espadon.modules.php 2020-08-04 15:45:52 +02:00
Philippe Grand
3fcacf7196
Update pdf_blochet.class.php 2020-08-04 15:44:25 +02:00
Philippe Grand
2627bec686
Update pdf_sepamandate.modules.php 2020-08-04 15:43:28 +02:00
Philippe Grand
6874feb09a
Update pdf_ban.modules.php 2020-08-04 15:42:14 +02:00
Philippe Grand
e4faa0228e
Update pdf_strato.modules.php 2020-08-04 15:40:42 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Laurent Destailleur
c78b19b3b8 Move module as experimental (it is working enough). 2020-08-03 16:39:52 +02:00
Laurent Destailleur
fa26d2acdf css 2020-08-03 16:31:52 +02:00
Laurent Destailleur
aa696d8343 Show warning in kanban view 2020-08-03 15:17:37 +02:00
Laurent Destailleur
d1f92fb66b NEW: Add module Credit transfer SEPA to manage payment of supplier using 
bank credit transfer SEPA files
 2020-08-03 14:15:14 +02:00
Philippe GRAND
42fcb64700 Change comment to fixe a lot of undefined method 2020-08-03 10:26:01 +02:00
Philippe GRAND
85b2adaaec Change comment to fixe a lot of undefined method 2020-08-03 10:13:18 +02:00
Philippe GRAND
0d6274c8fe Change comment to fixe a lot of undefined method 2020-08-03 10:04:54 +02:00
Philippe GRAND
d6c84ef5ce Change comment to fixe a lot of undefined method 2020-08-03 10:02:25 +02:00
Philippe GRAND
6fa3e8df4e Change comment to fixe a lot of undefined method 2020-08-03 10:00:20 +02:00
Philippe GRAND
3a2e527454 Change comment to fixe a lot of undefined method 2020-08-03 09:58:47 +02:00
Philippe GRAND
1ea21ee1b8 Change comment to fixe a lot of undefined method 2020-08-03 09:56:48 +02:00
Philippe GRAND
d446a38b34 Change comment to fixe a lot of undefined method 2020-08-03 09:54:19 +02:00
Philippe GRAND
9fd520b5d4 Change comment to fixe a lot of undefined method 2020-08-03 09:52:11 +02:00
Philippe GRAND
3b80e9a08e Change comment to fixe a lot of undefined method 2020-08-03 09:50:30 +02:00
Philippe GRAND
8ff27f89e5 Change comment to fixe a lot of undefined method 2020-08-03 09:48:25 +02:00
Philippe GRAND
703de5286f Change comment to fixe a lot of undefined method 2020-08-03 09:46:07 +02:00
Philippe GRAND
ed6d83687c Change comment to fixe a lot of undefined method 2020-08-03 09:44:44 +02:00
Philippe GRAND
2c4d8bceb6 Change comment to fixe a lot of undefined method 2020-08-03 09:39:54 +02:00
Philippe GRAND
c7bf47a00b Change comment to fixe a lot of undefined method 2020-08-03 09:38:05 +02:00
Philippe GRAND
857505a887 Change comment to fixe a lot of undefined method 2020-08-03 09:36:23 +02:00
Philippe GRAND
0e0adcbe43 Change comment to fixe a lot of undefined method 2020-08-03 09:33:19 +02:00
Philippe GRAND
38f4e0392d Change comment to fixe a lot of undefined method 2020-08-03 09:30:31 +02:00
Philippe GRAND
8bdf15a6a6 Change comment to fixe a lot of undefined method 2020-08-03 09:28:25 +02:00
Philippe GRAND
83d1ff2a6c Change comment to fixe a lot of undefined method 2020-08-03 09:25:17 +02:00
Philippe GRAND
0b75280104 Change comment to fixe a lot of undefined method 2020-08-03 09:19:55 +02:00
Philippe GRAND
ccb9d62a14 Change comment to fixe a lot of undefined method 2020-08-03 09:13:46 +02:00
Laurent Destailleur
93fea8591c Fix phpcs 2020-07-24 12:17:02 +02:00
Laurent Destailleur
6e36fba4f3 NEW Development of module Recruitment 2020-07-24 11:54:57 +02:00
Laurent Destailleur
acdb61b640
Merge pull request #14227 from defrance/patch-154 
NEW : add class for ticket edition (pdf or odt)
 2020-07-19 02:11:13 +02:00
BENKE Charlene
a2cf473891
add class for ticket edition (pdf or odt) 2020-07-13 14:24:07 +02:00
Philippe GRAND
5902dd6df3 Minimum version of PHP required by module 2020-07-11 15:10:53 +02:00
Philippe GRAND
2906e9b848 Minimum version of PHP required by module 2020-07-11 15:10:26 +02:00
Philippe GRAND
fc778e433f Minimum version of PHP required by module 2020-07-11 15:10:02 +02:00
Philippe GRAND
8c5bdb8fb6 Minimum version of PHP required by module 2020-07-11 15:09:36 +02:00
Philippe GRAND
3ee18e5852 Minimum version of PHP required by module 2020-07-11 15:09:15 +02:00
Philippe GRAND
1d5a1beb79 Minimum version of PHP required by module 2020-07-11 15:08:52 +02:00
Philippe GRAND
1bb60ca7cc Minimum version of PHP required by module 2020-07-11 15:08:28 +02:00
Philippe GRAND
1358801316 Minimum version of PHP required by module 2020-07-11 15:08:00 +02:00
Philippe GRAND
b4252b899c Minimum version of PHP required by module 2020-07-11 15:07:33 +02:00
Philippe GRAND
9451148928 Minimum version of PHP required by module 2020-07-11 15:07:09 +02:00
Philippe GRAND
bbde5a3c95 Minimum version of PHP required by module 2020-07-11 15:06:44 +02:00
Philippe GRAND
05b97dc134 Minimum version of PHP required by module 2020-07-11 15:06:17 +02:00
Philippe GRAND
eb602d8bae Minimum version of PHP required by module 2020-07-11 15:05:49 +02:00
Philippe GRAND
2e6addae11 Minimum version of PHP required by module 2020-07-11 15:05:20 +02:00
Philippe GRAND
f453c2272a Minimum version of PHP required by module 2020-07-11 15:04:54 +02:00
Philippe GRAND
3a4f526ccd Minimum version of PHP required by module 2020-07-11 15:04:31 +02:00
Philippe GRAND
8f37bb5a69 Minimum version of PHP required by module 2020-07-11 15:04:06 +02:00
Philippe GRAND
d4562a91ff Minimum version of PHP required by module 2020-07-11 15:03:38 +02:00
Philippe GRAND
8d06471a4e Minimum version of PHP required by module 2020-07-11 15:03:00 +02:00
Philippe GRAND
b26a1042d2 Minimum version of PHP required by module 2020-07-11 15:02:03 +02:00
Philippe GRAND
b2af2320ef Merge branch 'new_branch_11_07_2020' of github.com:grandoc/dolibarr into new_branch_11_07_2020 2020-07-11 14:57:26 +02:00
Philippe GRAND
a61955234f Minimum version of PHP required by module 2020-07-11 14:54:23 +02:00
Philippe GRAND
b02b6db181 Minimum version of PHP required by module 2020-07-11 14:43:30 +02:00
Philippe GRAND
8a2db6bad5 Minimum version of PHP required by module 2020-07-11 14:42:53 +02:00
stickler-ci
0d58c55167 Fixing style errors. 2020-07-11 12:42:38 +00:00
Philippe GRAND
ece128c9c5 Minimum version of PHP required by module 2020-07-11 14:42:04 +02:00
Philippe GRAND
7c84406494 Minimum version of PHP required by module 2020-07-11 14:41:10 +02:00
Philippe GRAND
370a7bcf38 Minimum version of PHP required by module 2020-07-11 14:39:46 +02:00
Philippe GRAND
0531dd00d9 Minimum version of PHP required by module 2020-07-11 14:38:44 +02:00
Philippe GRAND
baa9c39ace Minimum version of PHP required by module 2020-07-11 14:38:03 +02:00
Philippe GRAND
872b99be42 Minimum version of PHP required by module 2020-07-11 14:37:25 +02:00
Philippe GRAND
0fdb209045 Minimum version of PHP required by module 2020-07-11 14:36:22 +02:00
Philippe GRAND
7f5ebf2e31 Minimum version of PHP required by module 2020-07-11 14:35:36 +02:00
Philippe GRAND
c9c5d9cc70 Minimum version of PHP required by module 2020-07-11 14:34:11 +02:00
Philippe GRAND
fd01a4d154 Minimum version of PHP required by module 2020-07-11 14:31:16 +02:00
Laurent Destailleur
b2bd90ae1a Fix link to list of event 2020-07-09 12:33:28 +02:00
Alexandre SPANGARO
dc40ddb370 Some correction 2020-07-06 09:56:28 +02:00
Alexandre SPANGARO
82c96a4f83 Fix SticklerCi 2020-07-06 04:47:27 +02:00
Alexandre SPANGARO
725ef1057d Some correct 2020-07-06 04:19:50 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
146c521efd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/filefunc.inc.php
 2020-06-29 18:06:42 +02:00
Laurent Destailleur
5b3670f300 FIX SQL syntax error when editing extrafields 
Conflicts:
	htdocs/core/lib/security.lib.php
 2020-06-29 14:28:53 +02:00
Laurent Destailleur
7c5b0be6a3 FIX SQL syntax error when editing extrafields 2020-06-29 13:48:00 +02:00
Laurent Destailleur
7c4e737668 Clean code 2020-06-29 09:53:55 +02:00
Laurent Destailleur
a5893db106 FIX upload documents into manual ECM was reported a permission error 2020-06-28 22:05:55 +02:00
lvessiller
3eb695ffa8 NEW add region in export companies and contacts 2020-06-26 09:14:06 +02:00
Laurent Destailleur
c36c8ed447 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
 2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/fourn/class/paiementfourn.class.php
 2020-06-17 14:53:24 +02:00
Laurent Destailleur
7d3c176727 Prepare convertion of field "montant" into "amount" 2020-06-17 12:45:56 +02:00
Laurent Destailleur
6ea4928c79
Merge pull request #14090 from ATM-Consulting/FIX_11.0_missing_currency_columns_in_supplier_exports 
11.0 - FIX - missing currency columns in supplier exports
 2020-06-16 22:00:56 +02:00
Florian Mortgat
18d5ec7750 11.0 - FIX - missing currency columns in supplier exports 
(copy-pasted from modFacture.class.php)
 2020-06-16 10:56:10 +02:00
Laurent Destailleur
72130dacb9
Merge pull request #14061 from atm-gauthier/10.0_fix_progress_pdf 
FIX : percent must be displayed on one line
 2020-06-12 14:50:49 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/class/ticket.class.php
 2020-06-11 23:39:26 +02:00
Laurent Destailleur
2109a91992 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/takepos/admin/setup.php
 2020-06-11 23:36:55 +02:00
gauthier
92b89437d1 FIX : percent must be displayed on one line 2020-06-09 16:02:41 +02:00
Florian Mortgat
0a2099e0ac FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat 2020-06-09 14:22:32 +02:00
Laurent Destailleur
9a30d4ca44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:02 +02:00
Laurent Destailleur
c6a53d9b3d
Update pdf_blochet.class.php 2020-06-02 12:09:11 +02:00
DEMAREST Maxime (Indelog)
7189e060e0 Fix line heiht overflow for blochet template 
Fixed if by adding dynamic line height calculation. Now line height depend on
bank field content or transmitter field content. You can use long text in this
fields.
 2020-06-02 11:17:37 +02:00
Laurent Destailleur
c8d0476728 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
 2020-06-01 04:09:52 +02:00
Laurent Destailleur
dbac97a908 Fix several troubles into numbering modules. 
Prefix for takepos moved from TK to TC (TK was already used for tasks)
 2020-06-01 04:02:47 +02:00
Laurent Destailleur
156f09729e Debug module Payment by credit transfer 2020-05-30 02:10:41 +02:00
Laurent Destailleur
0a8b90c4e8 Debug module Payment by credit transfer 2020-05-30 02:10:02 +02:00
Laurent Destailleur
3b22b6192d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 21:36:08 +02:00
Laurent Destailleur
2e0cf05e55 phpcs 2020-05-28 21:20:30 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
 2020-05-28 20:20:39 +02:00
Laurent Destailleur
3606ed2bda Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2020-05-28 20:17:26 +02:00
Laurent Destailleur
8360ca4b20
Update pdf_crabe.modules.php 2020-05-28 17:38:20 +02:00
Laurent Destailleur
bdc73b5cae
Update pdf_crabe.modules.php 2020-05-28 17:37:53 +02:00
atm-lena
edc6abcea8 FIX Rounding Total TVA in "crabe" model pdf 2020-05-28 15:19:37 +02:00
Laurent Destailleur
e787978890 Doc 2020-05-27 23:12:26 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Laurent Destailleur
d8d5907aff
Merge pull request #13939 from grandoc/develop 
Fix : some comment and translation
 2020-05-23 15:11:32 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-22 08:27:12 +02:00
Laurent Destailleur
60f865fbb8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-22 00:58:27 +02:00
Laurent Destailleur
9e295d44f0 Code comment 2020-05-21 17:14:42 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Philippe GRAND
c77a1be176 fix comment and add some translation 2020-05-21 11:35:32 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
15f3c97fff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:59:11 +02:00
Laurent Destailleur
92cbff7749 Clean code 2020-05-20 23:40:04 +02:00
Laurent Destailleur
bd564486ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-17 20:03:09 +02:00
Laurent Destailleur
106fe7bde6 Clean conflict between direct debit and direct credit orders. 2020-05-17 15:06:09 +02:00
Scrutinizer Auto-Fixer
9699ee7263 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-15 11:55:31 +00:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod 
NEW possibilty to group payments by mode and show their subtotal
 2020-05-14 16:55:37 +02:00
Laurent Destailleur
7c01b54d73 Fix version on module list 2020-05-14 15:42:37 +02:00