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
Laurent Destailleur
6ec5dd02b6
Fix Fatal error with bad triggers
2020-05-14 15:27:10 +02:00
Laurent Destailleur
44d36815bd
Look and feel v12
2020-05-11 19:00:27 +02:00
Laurent Destailleur
c511af69fe
Debug look and feel v12
2020-05-10 21:07:49 +02:00
Laurent Destailleur
247acdd274
Fix position of custom groups of modules
2020-05-06 03:47:28 +02:00
Laurent Destailleur
4d6a45d491
Major doxygen fix
2020-05-03 22:48:35 +02:00
Laurent Destailleur
a88ab40384
Clean phpcs
2020-05-02 15:18:59 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
62a2469c71
Fix position of modules
2020-05-02 00:41:27 +02:00
Laurent Destailleur
66b33573ef
Fix menu
2020-04-28 18:30:38 +02:00
stickler-ci
2cf5f12a62
Fixing style errors.
2020-04-28 07:18:45 +00:00
DEMAREST Maxime (Indelog)
740b2c9228
NEW possibilty to group payments by mode and show their subtotal
...
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
2020-04-28 09:01:00 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Laurent Destailleur
b20d85b198
Fix phpcs
2020-04-26 23:06:52 +02:00
Laurent Destailleur
a36d0c96c1
Fix sql
2020-04-26 22:28:43 +02:00
Laurent Destailleur
1d68510c7d
Fix syntax error
2020-04-25 19:32:18 +02:00
Laurent Destailleur
068a890c36
Enable more PHPCS rules
2020-04-25 19:13:20 +02:00
Scrutinizer Auto-Fixer
1bf5745286
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Laurent Destailleur
38f2aad0c6
Debug asset module
2020-04-25 03:19:30 +02:00
Laurent Destailleur
3ed11f374a
Look and feel v12
2020-04-24 23:56:57 +02:00
Laurent Destailleur
7bbfd2175d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
Scrutinizer Auto-Fixer
548f3007cf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
00e9ed1452
Merge pull request #13716 from atm-florian/11.0
...
fix: remove debug pring
2020-04-23 18:22:18 +02:00
Laurent Destailleur
dc0978e88b
Merge pull request #13720 from FHenry/dev_fix_odt
...
fix: uniformize extrafeild replacemnt for ODT docs
2020-04-23 18:22:00 +02:00
Laurent Destailleur
8401f68bde
Update doc_generic_task_odt.modules.php
2020-04-23 18:21:17 +02:00
Laurent Destailleur
86be024dcc
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-23 17:17:42 +02:00
florian HENRY
32385b75e1
travis
2020-04-23 16:18:31 +02:00
florian HENRY
6dafb30ee8
fix time duration substitution
2020-04-23 15:57:06 +02:00
florian HENRY
55a9aa5991
fix: missing duration odt task substitution
2020-04-23 15:55:37 +02:00
florian HENRY
882b39628f
fix: uniformize extrafeild replacemnt for ODT docs
2020-04-23 15:50:42 +02:00
Laurent Destailleur
6819255b76
FIX #13650
2020-04-23 13:49:18 +02:00
florian HENRY
7972174787
remove debug pring
2020-04-23 13:44:23 +02:00
Laurent Destailleur
3101f72b5c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-22 18:28:59 +02:00
Laurent Destailleur
39c454d07b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-22 18:28:52 +02:00
Laurent Destailleur
bbfb93bc42
Merge pull request #13690 from OPEN-DSI/new-societe-import-update-contacts
...
NEW can update contact in import model
2020-04-22 18:09:49 +02:00
Laurent Destailleur
c1d0cae24d
Merge pull request #13692 from hregis/11.0_bug
...
FIX missing fk_bank during export of suppliers invoices
2020-04-22 13:18:46 +02:00
Regis Houssin
f6f9ca48dd
FIX missing fk_bank during export of suppliers invoices
2020-04-22 12:23:26 +02:00
florian HENRY
8be14060d6
fix: avoid php notice
2020-04-22 12:08:05 +02:00
VESSILLER
cce3085a79
NEW can update contact in import model
2020-04-22 10:44:23 +02:00
Frédéric FRANCE
8f42707220
Update pdf_crabe.modules.php
2020-04-21 23:20:11 +02:00
Frédéric FRANCE
7972a35e36
Update pdf_azur.modules.php
2020-04-21 23:12:12 +02:00
Frédéric FRANCE
2fde77703d
add extrafields in note for enstein
2020-04-21 23:06:41 +02:00
Laurent Destailleur
770fca0b33
Debug the double language feature in pdf
2020-04-21 20:16:36 +02:00
Laurent Destailleur
cadb52c5b3
Look and feel v12
2020-04-20 19:39:34 +02:00
Laurent Destailleur
230fe26b58
Look and feel v12
2020-04-20 18:38:25 +02:00
Laurent Destailleur
40b3db940c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-20 14:44:36 +02:00
Frédéric FRANCE
7b68a2a60e
Update pdf_crabe.modules.php
2020-04-19 21:50:52 +02:00
Laurent Destailleur
3e7f0b364e
FIX #13611
2020-04-17 10:22:08 +02:00
ATM john
3b4b30ea57
Fix merge remaining lines
2020-04-16 20:33:53 +02:00
ATM john
c334a931de
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-16 20:29:54 +02:00
Laurent Destailleur
5254a94038
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
Laurent Destailleur
984fa0d5a0
Fix hidden const
2020-04-16 15:24:12 +02:00
Scrutinizer Auto-Fixer
d021559b16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-15 22:42:57 +00:00
Laurent Destailleur
43ec6c3ae5
Fix phpcs
2020-04-15 23:38:14 +02:00
Laurent Destailleur
3be426be5b
Align sponge and crabe
2020-04-15 02:24:08 +02:00
Laurent Destailleur
1dd951495b
Removed hard coded dependency on an external module
2020-04-15 02:20:57 +02:00
Laurent Destailleur
c337bd91fe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-14 21:58:13 +02:00
Laurent Destailleur
d143bd8aec
FIX #13589 missing price_level in import of thirdparties
2020-04-14 21:22:08 +02:00
ATM john
b70cd84402
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-14 14:11:12 +02:00
Laurent Destailleur
8c8a8263dd
Merge branch 'develop' into patch-145
2020-04-13 16:22:19 +02:00
Laurent Destailleur
99cbb273c8
Update pdf_crabe.modules.php
2020-04-13 16:21:47 +02:00
Laurent Destailleur
e02ac3b518
Trans
2020-04-13 15:57:25 +02:00
Laurent Destailleur
96d087c99d
Fix clean event report
2020-04-13 02:59:33 +02:00
Laurent Destailleur
d503c1b6be
Fix help
2020-04-12 23:18:21 +02:00
Laurent Destailleur
5b8864b46e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2020-04-12 21:41:40 +02:00
Laurent Destailleur
549b126eff
Look and feel v12
2020-04-12 21:36:57 +02:00
Laurent Destailleur
08301e2696
Merge pull request #13567 from atm-maxime/new_expensereport_tab_remove
...
Remove expense report tab from user
2020-04-12 17:11:37 +02:00
Laurent Destailleur
d7784887d1
More font awesome picto
2020-04-12 14:58:50 +02:00
Maxime Kohlhaas
2ef787c7ff
Remove expense report tab from user
2020-04-11 17:38:54 +02:00
simicar29
9573f1289a
FIX #7594
...
This is a temptative fix of the bad "multi page break" in expense report
2020-04-11 13:42:37 +02:00
Laurent Destailleur
db30f0bbc4
NEW Receipt printer module moved from 'development' to 'experimental'
2020-04-11 00:56:18 +02:00
Laurent Destailleur
5ff981bf61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/perms.php
2020-04-10 12:04:21 +02:00
Laurent Destailleur
874cbcefc7
Fix permission to close a proposal or order was not correctly used
...
#13547
2020-04-10 11:54:14 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
83af4ebea4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/product/stock/class/entrepot.class.php
htdocs/product/stock/list.php
2020-04-10 01:22:22 +02:00
Francis Appels
0a8a8bafa0
FIX print pictures in shipment docs
2020-04-09 15:40:36 +02:00
Laurent Destailleur
361baa0c73
CSS
2020-04-08 17:56:24 +02:00
Laurent Destailleur
02436c1e84
NEW The module selection uses a KanBan view by default.
2020-04-08 17:04:23 +02:00
Laurent Destailleur
7514aa4612
Merge pull request #13506 from joseplluis/patch-6
...
NEW add professional ID 1 in sepamandate document
2020-04-08 14:40:38 +02:00
Laurent Destailleur
0716951b6d
Fix logo
2020-04-08 13:38:29 +02:00
Laurent Destailleur
9d9364256b
More picto using fontawesome.
2020-04-07 16:45:08 +02:00
Laurent Destailleur
809c741d11
Can use font awesome as picto of object and modules.
2020-04-06 15:34:28 +02:00
Laurent Destailleur
082b205149
WIP Work on Kanban view for module list
2020-04-06 15:12:42 +02:00
stickler-ci
3b9267fd8a
Fixing style errors.
2020-04-06 10:51:06 +00:00
Josep Lluís
35f3052280
NEW add VAT ID in sepamandate document
...
add: VAT ID in sepamandate document
2020-04-06 12:47:57 +02:00
Scrutinizer Auto-Fixer
612bac6598
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-05 00:44:59 +00:00
Laurent Destailleur
e6641b5369
Fix doc
2020-04-03 18:01:54 +02:00
ATM john
c466beea3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-03-31 16:28:43 +02:00
oscim
3b8a16e3fd
Update modCommande.class.php
...
add extrafileds company in export orders
2020-03-31 11:05:21 +02:00
Laurent Destailleur
b33552fb6f
Fix phpcs
2020-03-27 16:13:53 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
354cb8c1b0
Work on Kanban view for modules
2020-03-27 01:59:17 +01:00
Alexandre SPANGARO
5528e9ef38
Work on split module fournisseur
2020-03-24 22:02:58 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Alexandre SPANGARO
89de39f199
Move supplier proposal menu to the core
2020-03-23 08:51:38 +01:00
Alexandre SPANGARO
b613769606
Work on split module fournisseur
2020-03-22 06:09:47 +01:00
Alexandre SPANGARO
bac099dc60
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
2020-03-19 11:48:21 +01:00
Laurent Destailleur
8fa505422e
Merge pull request #13378 from atm-florian/develop
...
NEW: Export module, add extrafields for Contract and Contract line
2020-03-18 19:27:24 +01:00
Laurent Destailleur
87edf27bbf
Merge branch 'develop' into dev_NEW_setup_SeparateurCSV
2020-03-18 19:12:52 +01:00
Laurent Destailleur
3f4a7b2387
Merge pull request #13350 from TobiasSekan/FixMissingUserInOdtSupProposal
...
FIX missing "contact_" substitution in supplier proposal (ODT template)
2020-03-18 18:55:03 +01:00
Laurent Destailleur
8bab245c7e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
florian HENRY
15614abc3f
NEW: add csv separator setup in module admin
2020-03-18 15:08:58 +01:00
Laurent Destailleur
cc93a40c45
Fix label of local tax
2020-03-18 14:06:15 +01:00
florian HENRY
50a0bfef64
NEW: Export module, add extrafields for Contract and Contract line
2020-03-18 09:53:13 +01:00
Alexandre SPANGARO
033f796398
Work on split module fournisseur
2020-03-17 14:51:48 +01:00
Laurent Destailleur
73f2e9e5de
WIP migrate num_paiement into num_payment
...
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
Laurent Destailleur
4b1dd27c5f
Move takepos.php file into index.php to match other dir structure
2020-03-16 15:41:21 +01:00
stickler-ci
fd4e807211
Fixing style errors.
2020-03-16 07:40:10 +00:00
Tobias Sekan
debecabe69
FIX missing "contact_" substitution in supplier proposal
2020-03-16 08:38:01 +01:00
Laurent Destailleur
37fce0d3ee
Fix position on merou
...
Fix preselected value on contact
2020-03-14 14:45:37 +01:00
Laurent Destailleur
a437125962
Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules
...
NEW add numbering module for cash desk
2020-03-13 16:58:27 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
VESSILLER
826ed67921
FIX travis errors sql escape
2020-03-13 09:01:22 +01:00
VESSILLER
04c0332bee
FIX travis errors
2020-03-12 18:31:43 +01:00
VESSILLER
1379b2ce87
FIX travis errors
2020-03-12 18:21:44 +01:00
VESSILLER
70ebc61c1f
Module TakePos - NEW add numbering module for cash desk
2020-03-12 17:43:59 +01:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Laurent Destailleur
61cb1ec81a
Merge pull request #13185 from atm-john/12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
...
NEW : Allow extrafields on pdf : extend to line desc
2020-03-11 17:12:14 +01:00
Laurent Destailleur
89a8531140
Merge pull request #13237 from aspangaro/12.0_a18
...
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-11 17:08:49 +01:00
Laurent Destailleur
7d0d0aa75a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Regis Houssin
e962afb9c5
FIX modFournisseur is required by modSupplierProposal
2020-03-02 14:10:37 +01:00
Alexandre SPANGARO
6982997de5
Fix error
2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-01 04:52:12 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16
...
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-29 13:02:43 +01:00
Alexandre SPANGARO
86d9622360
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 10:44:04 +01:00
Laurent Destailleur
d172a95dfe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-25 14:37:04 +01:00
Laurent Destailleur
2a6652f6b5
Merge pull request #13192 from atm-florian/11_fixcomumnRUMMissingintoImport
...
fix missing column into Bank import
2020-02-24 22:55:47 +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
John Botella
1ca1f0677b
fix PDF cell padding
2020-02-24 17:48:01 +01:00
florian HENRY
9f8166ed37
fix missing column into import
2020-02-24 15:14:01 +01:00
florian HENRY
b2b2291117
fix missing column into import
2020-02-24 15:12:26 +01:00
florian HENRY
2c26ddb22b
fix missing column into import
2020-02-24 15:11:14 +01:00
Tobias Sekan
2d9300cedb
Add position to ODT supplier_proposal template
2020-02-24 15:06:21 +01:00
Tobias Sekan
fc76586e2f
Add position to ODT supplier order template
2020-02-24 15:05:04 +01:00
Tobias Sekan
1f2203f0d6
Add position to ODT propale template
2020-02-24 15:04:02 +01:00
Tobias Sekan
933b46790a
Add position to ODT mo template
2020-02-24 15:02:11 +01:00
Tobias Sekan
7469aa1f35
Add position to ODT invoice template
2020-02-24 15:00:37 +01:00
Tobias Sekan
cdbe6c1e81
Add position to ODT contract template
2020-02-24 14:59:20 +01:00
Tobias Sekan
b29d8e53ed
Add position to ODT order template
2020-02-24 14:58:01 +01:00
Tobias Sekan
4a5593e213
Add position to ODT for bom
2020-02-24 14:56:26 +01:00
John Botella
06b2d459c0
Fix cell padding
2020-02-24 14:18:49 +01:00
Laurent Destailleur
3682d9143e
Fix showing bank account on PDF
2020-02-24 04:55:44 +01:00
Laurent Destailleur
150d4d33f6
Fix showing bank account on PDF
2020-02-24 04:55:09 +01:00
ATM john
13790422dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-24 00:18:37 +01:00
ATM john
377b9a6b88
Add extrafields on PDF object lines desc for compatible pdf
2020-02-24 00:14:43 +01:00
ATM john
5ecef88b35
allow in extrafield conf to choose to add extrafield in a new col or append it to description, it could be useful for html or long text extrafields
2020-02-23 23:04:24 +01:00
ATM john
93c9f07cb9
Fix note x position
2020-02-23 20:59:04 +01:00
ATM john
8c36dd0ad8
add extrafields in notes
2020-02-23 02:26:21 +01:00
ATM john
60b3d9d4db
Add extrafields on PDF object lines for compatible pdf
2020-02-22 18:07:15 +01:00
ATM john
e209fd2973
Add extrafields on PDF object lines
2020-02-22 16:27:44 +01:00
ATM john
aa77d96f23
remove IDE warnings
2020-02-22 12:06:21 +01:00
ATM john
4117aa56a2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-22 11:19:49 +01:00
Laurent Destailleur
e4b00c5c20
Merge branch 'develop' into master
2020-02-21 18:20:10 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
55bef402c4
Fix remove a lot of warnings on Eclipse
2020-02-21 17:47:36 +01:00
Laurent Destailleur
ec09e7222d
Fix remove a lot of warnings on Eclipse
2020-02-21 17:31:37 +01:00
andreubisquerra
e316061a9a
Fix travis
2020-02-20 16:26:30 +01:00
andreubisquerra
7a241ba042
Fix travis
2020-02-20 15:47:40 +01:00
javierybar
2942e85e47
More elegant and easy to understand printer setup
2020-02-20 15:16:17 +01:00
Laurent Destailleur
f109864670
NEW Add a profil to import contact categories
...
Load roles of contact only when required
2020-02-19 13:22:24 +01:00
John Botella
729048a113
Fix langs
2020-02-19 12:33:36 +01:00
John Botella
d65c17df7d
Add retained warranty for all invoice for crabe PDF
2020-02-19 12:30:52 +01:00
John Botella
6acf10c0d4
extend retained warranty to be available for all invoices
2020-02-19 11:54:55 +01:00
Laurent Destailleur
ce3e977fc3
Merge pull request #13141 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2020-02-18 23:49:10 +01:00
Laurent Destailleur
88b104bc2f
Merge pull request #13121 from aspangaro/12.0_a14
...
NEW: Donation - Update FR CERFA to 11580*04
2020-02-18 23:48:08 +01:00
Scrutinizer Auto-Fixer
fd48877dc6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
dacf896f80
FIX Can read salary if permission + user under hierarchy
2020-02-18 23:44:36 +01:00
Laurent Destailleur
ce09ec8805
Fix phpcs
2020-02-18 23:35:45 +01:00
Laurent Destailleur
2ac064059a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/projet/element.php
2020-02-18 22:40:43 +01:00
Laurent Destailleur
24bb61b5e4
FIX Usage of project not available in export.
2020-02-18 12:51:53 +01:00
Laurent Destailleur
67eb584a7f
FIX Missing field "billed" in export
2020-02-18 12:22:25 +01:00
Laurent Destailleur
a6b0fec90b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee
FIX duplicate class name into some log lines
2020-02-17 12:34:00 +01:00
Alexandre SPANGARO
aa9d00c62e
FIX
2020-02-17 07:47:08 +01:00
Alexandre SPANGARO
76a369d351
NEW: Donation - Update FR CERFA to 11580*04
2020-02-17 07:43:24 +01:00
Laurent Destailleur
4b5cda5cd2
Code comment on OAUth ahtent
2020-02-16 21:16:00 +01:00
Laurent Destailleur
fc018d0063
Module MO is now stable
2020-02-13 17:24:29 +01:00
Scrutinizer Auto-Fixer
011803ac71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Scrutinizer Auto-Fixer
17010478ba
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 09:44:08 +00:00
Laurent Destailleur
4762bafb02
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/mrp/class/mo.class.php
2020-02-12 22:58:37 +01:00
Laurent Destailleur
e69b362fb5
Merge pull request #13079 from RubenRuCh/11.0
...
FIX : #13038 ExpenseReport PDF - custom category description is not correct
2020-02-12 21:59:23 +01:00
stickler-ci
f8eaca24af
Fixing style errors.
2020-02-12 20:54:56 +00:00
Laurent Destailleur
c31fcb3981
Merge branch 'develop' into patch-30
2020-02-12 21:53:02 +01:00
Laurent Destailleur
7931734ecb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
Laurent Destailleur
cc6313cdf3
Fix import examples
2020-02-11 19:32:27 +01:00
Laurent Destailleur
8518e0752f
NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page
2020-02-11 16:01:32 +01:00
Ruger
8d9de521f3
FIX : #13038 ExpenseReport PDF - custom category description is not correct
2020-02-11 09:13:15 +01:00
Pierre Ardoin
fab8536f05
add project ref and title
2020-02-10 17:02:10 +01:00
Pierre Ardoin
f9b03596f6
Add project ref and title
2020-02-10 17:01:21 +01:00
Pierre Ardoin
573d86c725
Add project's ref and Title
2020-02-10 16:57:59 +01:00
Pierre Ardoin
546e7b1bcf
Add project Ref and Title
2020-02-10 16:57:02 +01:00
Pierre Ardoin
f279b4138b
Add Project Ref and Title
2020-02-10 16:52:41 +01:00
Laurent Destailleur
82f5482e25
Merge pull request #13071 from aspangaro/12.0_a13
...
NEW: Add accountancy code of thirdparty in supplier export
2020-02-10 15:40:09 +01:00
Pierre Ardoin
6de3795648
change translation Ref
...
ProjectRef -> RefProject
2020-02-10 09:10:45 +01:00
Pierre Ardoin
d74e1d9182
Update pdf_crabe.modules.php
2020-02-10 09:07:26 +01:00
stickler-ci
5022e58b95
Fixing style errors.
2020-02-10 08:04:40 +00:00
Pierre Ardoin
bd00803090
Update pdf_crabe.modules.php
2020-02-10 09:03:00 +01:00
stickler-ci
6ffbab0a63
Fixing style errors.
2020-02-10 08:01:40 +00:00
Pierre Ardoin
815206cb15
Add Project Title in header of pdf
...
Add project Title if Global Constant PDF_SHOW_PROJECT_TITLE is active.
2020-02-10 08:59:22 +01:00
