Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
jpb
63c82b47fe
Merge branch '11.0_currencyRateEditor' of github.com:atm-jpb/dolibarr into develop_editorRate
2020-10-23 12:27:14 +02:00
jpb
1ecff0a608
add list and crud
2020-10-23 11:58:25 +02:00
Frédéric FRANCE
82c3f63c5c
replace deprecated
2020-10-22 22:54:29 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Laurent Destailleur
9699bdc0fa
Fix phpcs
2020-10-22 21:31:34 +02:00
Laurent Destailleur
8074d2cc1d
NEW Add validation of MX domain for emails
2020-10-22 20:01:59 +02:00
Laurent Destailleur
fb7202b7f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-10-22 17:55:38 +02:00
Laurent Destailleur
a17c391efe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/product/composition/card.php
2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2020-10-22 17:34:48 +02:00
Laurent Destailleur
31f1ab73b1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-10-22 17:31:29 +02:00
Laurent Destailleur
c09e71962e
Merge pull request #15060 from grandoc/new_branch_19_10_2020
...
fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/…
2020-10-22 16:11:47 +02:00
Laurent Destailleur
763d0baa14
Merge pull request #15066 from louiscarrese/develop
...
CLOSE #15065 Put the product label in bold in the PDF templates if co…
2020-10-22 15:53:43 +02:00
Laurent Destailleur
2a31d43938
FIX Show errors in session on login page
2020-10-20 18:41:26 +02:00
Florian Mortgat
529dfb8dfb
FIX 9.0 - supplier proposals as linked objects of events are not correctly fetched
2020-10-20 16:37:15 +02:00
Louis Carrese
693e345cab
CLOSE #15065 Fix formatting
...
Had spaces instead of tabs...
2020-10-20 14:34:17 +02:00
Louis Carrese
f377456132
CLOSE #15065 Put the product label in bold in the PDF templates if configured
...
The global configuration variable PDF_BOLD_PRODUCT_LABEL is checked to put the product label in bold in the PDF
templates.
This modification is based on the same behaviour for the product reference, found at line 1373 of the same file.
The products table of the invoices / commercial propositions is produced in the PDF library, hence we have to modify
this library to style the invoices.
Producing a new template would mean duplicating code from the library with the maintenace implications.
2020-10-20 14:19:37 +02:00
Philippe Grand
85513318d0
Update functions.lib.php
2020-10-20 09:30:41 +02:00
Philippe GRAND
5233c6064f
fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/.../domains/httpdocs/core/lib/functions.lib.php on line 4379
2020-10-19 16:30:12 +02:00
Laurent Destailleur
4fe857f5d2
Change picto to close a widget
2020-10-17 17:54:09 +02:00
Laurent Destailleur
885e6caaa1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2020-10-16 15:53:31 +02:00
Laurent Destailleur
6bba249935
FIX pdf_getlinetotalwithtax must show total incl tax
2020-10-16 15:50:51 +02:00
Laurent Destailleur
e74b833d7f
Look and feel v13
2020-10-16 15:40:52 +02:00
Laurent Destailleur
4dea8c4bb7
Fix missing token
2020-10-16 13:36:05 +02:00
Laurent Destailleur
5905d3be64
Fix phpcs
2020-10-16 00:06:26 +02:00
Laurent Destailleur
24f7a8aeed
Merge pull request #15028 from FHenry/fix_intracom
...
fix table creation for intracom and change reserved name column name
2020-10-15 20:19:05 +02:00
Laurent Destailleur
14a26c499f
Merge pull request #15027 from ATM-Nicolas/fix_ecm_src_object_type
...
FIX : Use table_element instead of element
2020-10-15 20:14:39 +02:00
Laurent Destailleur
5b37ff0bfd
Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
...
tests.
2020-10-15 19:36:08 +02:00
Laurent Destailleur
844c4dec4d
css
2020-10-15 13:16:17 +02:00
Florian HENRY
a0d1e96bfd
fix table creation for intracom and change reserved name column name
2020-10-15 11:37:44 +02:00
ATM-Nicolas
20aee01fd8
FIX : Use table_element instead of element
2020-10-15 11:14:20 +02:00
Laurent Destailleur
20d5098ce2
Fix regression in dol_getdate()
2020-10-14 19:42:17 +02:00
Laurent Destailleur
a0f7aad591
Merge pull request #15019 from ATM-Nicolas/new_ecm_src_object_fields
...
NEW : Fill ECM src object fields in dol_add_file_process
2020-10-14 17:35:29 +02:00
Laurent Destailleur
ba001803ed
Update files.lib.php
2020-10-14 17:35:14 +02:00
Laurent Destailleur
57aabfb3c5
Merge pull request #15013 from FHenry/dev_objectrefferent_for_BOM
...
NEW display stat for BOM on "object referent"/linked Object product tab
2020-10-14 17:14:47 +02:00
Laurent Destailleur
e8ea7125e5
Removed the FIXME. The dol_getdate can now use a timezone.
2020-10-14 17:11:22 +02:00
ATM-Nicolas
98eb11be62
NEW : Fill ECM src object fields in dol_add_file_process
2020-10-14 16:59:05 +02:00
Laurent Destailleur
3cf2b6b5eb
Doc comment.
2020-10-14 15:01:50 +02:00
stickler-ci
8bfb04ea7f
Fixing style errors.
2020-10-14 08:34:30 +00:00
Florian HENRY
ee67d2b1a8
fixnhish bom product stats
2020-10-14 10:30:39 +02:00
Florian HENRY
6ff58aafdc
Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM
2020-10-14 08:43:07 +02:00
Florian HENRY
74155a49be
finish BOM stat referent object
2020-10-14 08:42:57 +02:00
Laurent Destailleur
4a3a3190ea
Standardize pdf templates
2020-10-14 01:46:49 +02:00
Laurent Destailleur
bc6b5d919a
Better responsive
2020-10-13 10:51:51 +02:00
Florian HENRY
4bf428fbf8
Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM
2020-10-13 08:13:54 +02:00
Laurent Destailleur
75997bb8f5
Minor fixes
2020-10-12 14:01:15 +02:00
Florian HENRY
739de365c0
load stat_bom
2020-10-12 13:52:50 +02:00
Alexandre SPANGARO
8876457b54
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-10 06:47:05 +02:00
Laurent Destailleur
cc82a15688
css
2020-10-09 18:43:24 +02:00
Laurent Destailleur
b6fc33c454
Fix avoid error when we sumbit form to change page on conciliation
2020-10-09 11:13:02 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Laurent Destailleur
24d35ff9b5
CSS
2020-10-08 11:52:58 +02:00
Laurent Destailleur
70fa262293
CSS
2020-10-08 09:30:15 +02:00
Laurent Destailleur
ff739dcbd2
Increase size of small image (used by PDF)
2020-10-07 19:39:17 +02:00
Laurent Destailleur
561ca757d7
phpcs
2020-10-07 17:17:13 +02: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
96ab66ea5a
Add function
2020-10-07 14:58:54 +02:00
Laurent Destailleur
d1c2772ee7
NEW Add function dolButtonToOpenUrlInDialogPopup() to be able to open
...
any url into a dialog popup.
2020-10-07 12:31:15 +02:00
Laurent Destailleur
47c80f0d14
Merge pull request #14942 from TobiasSekan/ShowProjectOverviewCount
...
Show count on project overview tab
2020-10-06 23:34:43 +02:00
Laurent Destailleur
13ec304b79
Update project.lib.php
2020-10-06 23:30:51 +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
c8cd55e158
debug access right after rename class #14697
2020-10-06 15:57:50 +02:00
Laurent Destailleur
95f67309e2
Clean code
2020-10-06 15:11:45 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697
2020-10-06 13:32:02 +02:00
Laurent Destailleur
254d9edbb9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-06 13:18:58 +02:00
Laurent Destailleur
6933b7ec9c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/agenda.lib.php
2020-10-06 13:15:52 +02:00
Laurent Destailleur
989074f13a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-10-06 13:13:31 +02:00
Sekan, Tobias
3ceb5c217f
Show count on project overview tab
2020-10-06 12:56:28 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697
2020-10-06 12:05:24 +02:00
Aurélien
140200213e
change table into DB and ref #14697
2020-10-06 11:04:31 +02:00
Alexandre SPANGARO
d83d9895e0
NEW Vat report - Invert constant to show by default zero vat in reports
2020-10-05 20:52:31 +02:00
Aurélien
c1b0c1f6a2
rename folder ref to Module Delivery
2020-10-05 15:32:29 +02:00
Laurent Destailleur
afd6da3b94
Better error management
2020-10-05 14:51:28 +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
Laurent Destailleur
cfc3c01815
Factorize code to know if a parameter is used to store a secret
2020-10-05 12:13:06 +02:00
Laurent Destailleur
62177edab1
NEW Can force the antivirus from conf file or autoprepend ini setup.
2020-10-05 05:00:59 +02:00
ptibogxiv
dd1904c521
Fix multicompany in last action box
2020-10-04 13:58:46 +02:00
Laurent Destailleur
9b3cd421ee
Fix doc
2020-10-03 14:56:04 +02:00
Laurent Destailleur
3b34c496cc
Code
2020-10-03 14:11:47 +02:00
Laurent Destailleur
581a3d8808
FIX Add a better message when file size is too large
2020-10-03 14:02:53 +02:00
Laurent Destailleur
50ca9f4145
Clean code
2020-10-02 19:10:30 +02:00
Laurent Destailleur
00cb3277ec
Merge pull request #14891 from inoveaconseil/Newhidelabelvariant
...
NEW hide label in pdf for variants
2020-10-02 13:45:52 +02:00
Laurent Destailleur
7e414fe9da
Merge pull request #14889 from frederic34/ecm_extrafields
...
NEW Add extrafields support on ECM module
2020-10-02 13:44:45 +02:00
Laurent Destailleur
0893f0250a
Minor bug fixes
2020-10-02 12:54:56 +02:00
Nicolas
9e4e027495
Hide label
2020-10-02 09:39:42 +02:00
Nicolas
85dfb5bf3c
Hide the label into pdf document for variants
2020-10-02 09:27:01 +02:00
Nicolas
e72fbbfe17
Hide the label into pdf document for variants
2020-10-02 09:21:44 +02:00
Laurent Destailleur
813deee4a5
Fix phpcs
2020-10-02 01:14:43 +02:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields
2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm
2020-10-02 00:21:13 +02:00
stickler-ci
e14c971b69
Fixing style errors.
2020-09-30 13:29:20 +00:00
ptibogxiv
9624a33e53
FIX date and user cloture / closing display
...
temporary fix while convert french to english term in dolibarr
2020-09-30 15:27:16 +02:00
Laurent Destailleur
f442dac2c9
Add token on most GET url for admin action
2020-09-30 15:13:28 +02:00
Laurent Destailleur
1e176fad8f
Fix GETPOST on array
2020-09-29 21:28:07 +02:00
Laurent Destailleur
fba8fdae6e
Merge pull request #14856 from bafbes/abb120146
...
new:bankline_prepare_head for bank lines
2020-09-29 16:40:51 +02:00
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
Laurent Destailleur
29414251f5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2020-09-29 13:19:03 +02:00