lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,108 Commits 43 Branches 150 Tags 886 MiB
81fbb80823
Commit Graph

4864 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
20f9154cf3 NEW: Add accountancy code of thirdparty in supplier export 2020-02-10 06:24:13 +01:00
Alexandre SPANGARO
d28f110100 NEW: Add accountancy code of thirdparty in contact export 2020-02-10 06:06:27 +01:00
ptibogxiv
8100708639 Update pdf_espadon.modules.php 2020-02-08 14:57:04 +01:00
ptibogxiv
ae5da164c6 FIX need weight short label in shipping doc 
need short label because value + term is too long
 2020-02-08 14:56:36 +01:00
Laurent Destailleur
b66c2a29a2 Merge branch 'develop' into patch-301 2020-02-08 14:54:23 +01:00
Laurent Destailleur
4e4fd4c76c Remove code using a no more used field 2020-02-07 13:15:51 +01:00
Laurent Destailleur
cd58822d98 Can edit a table of resolution code for tickets 2020-02-07 12:48:41 +01:00
ptibogxiv
2ca6b8f633
Update pdf_espadon.modules.php 2020-02-06 10:49:05 +01:00
ptibogxiv
f1cce26ef0
FIX need weight short label in shipping doc 
need short label because value + term is too long
 2020-02-06 10:47:56 +01:00
Laurent Destailleur
48e6db17bd Fix doc 2020-02-06 10:28:49 +01:00
Laurent Destailleur
a2bb64354b Fix bad merge 2020-02-05 14:56:01 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
stickler-ci
5dcd5e5b87 Fixing style errors. 2020-02-03 09:54:35 +01:00
AdrianDominik
ed269a387f FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page 2020-02-03 09:54:34 +01:00
Laurent Destailleur
37617bbce8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 03:48:27 +01:00
Laurent Destailleur
5633f58477 FIX #12978 2020-02-03 03:25:41 +01:00
Laurent Destailleur
ccf8e81f93 FIX #12975 2020-02-03 03:10:10 +01:00
Laurent Destailleur
ff6bcbdcf8 Fix trans 2020-02-03 03:10:03 +01:00
Laurent Destailleur
240727c3e1 FIX #12975 2020-02-03 03:08:54 +01:00
Laurent Destailleur
3f73339818 Fix trans 2020-02-03 03:01:23 +01:00
Laurent Destailleur
fc47fa5ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/element.php
 2020-02-03 02:58:45 +01:00
Laurent Destailleur
ffa847bc8e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-02 19:32:37 +01:00
Laurent Destailleur
1c24bcc724 FIX CVE Need permission to be able to develop modules 2020-01-31 10:29:41 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
1e879126cd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-01-29 19:28:06 +01:00
Laurent Destailleur
60f772d285 FIX Pending amount to pay must be zero if invoice close for anticipated 
payment.
 2020-01-29 17:56:09 +01:00
andreubisquerra
09bcb39cff
Default to Example 2020-01-28 18:59:51 +01:00
andreubisquerra
d0b3614c57
Default receipt template 2020-01-28 15:31:03 +01:00
Laurent Destailleur
a230a0aa13 Fix url to pay 2020-01-27 21:37:52 +01:00
Laurent Destailleur
17ceeb6a6e
Merge pull request #12729 from frederic34/patch-6 
NEW upload odt models for order
 2020-01-26 23:55:04 +01:00
Laurent Destailleur
9cd2a63752
Merge pull request #12739 from frederic34/patch-7 
NEW upload odt models for proposal
 2020-01-26 23:49:31 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
06731bdd59 Fix phpcs 2020-01-25 14:40:16 +01:00
Laurent Destailleur
f2771b3365 FIX #12896 2020-01-25 14:23:23 +01:00
Laurent Destailleur
41577714ce Add link to pay online into sponge template. 2020-01-23 11:25:08 +01:00
Laurent Destailleur
298b273496
Merge branch 'develop' into patch-22 2020-01-23 11:20:24 +01:00
Laurent Destailleur
2679f057fb Doc 2020-01-22 14:40:43 +01:00
Laurent Destailleur
d6a31f60cd Clean code 2020-01-22 14:39:00 +01:00
Laurent Destailleur
ee21ea5ef8 Fix phpcs 2020-01-22 14:27:38 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +01:00
Laurent Destailleur
395b9bf7ac Fix syntax error 2020-01-22 13:41:05 +01:00
Laurent Destailleur
de99426247 Fix MRP 2020-01-22 12:53:51 +01:00
Laurent Destailleur
8bd835d937 NEW Add option PDF_USE_ALSO_LANGUAGE_CODE to generate PDF in 2 languages 
in same document.
 2020-01-21 16:17:18 +01:00
Laurent Destailleur
b813a5a4e0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 13:03:02 +01:00
Laurent Destailleur
ca3e6ff60c Doc 2020-01-21 12:46:28 +01:00
Laurent Destailleur
49e875aa96 Fix fatal error 2020-01-21 12:21:37 +01:00
Laurent Destailleur
a3a3835c76 Fix fatal error 2020-01-21 12:19:39 +01:00
stickler-ci
b864325041 Fixing style errors. 2020-01-21 09:07:14 +00:00
Pierre Ardoin
1d4e36ba3d
Add Link to Pay if Online payment is used 
Before : URL to Online Payment never shown.

Now : URL shown when PayPal, Stripe or PayBox are used.
 2020-01-21 10:04:49 +01:00
Laurent Destailleur
4598538b42 Prepare PDF templates to use 2 languages for titles 2020-01-21 01:55:00 +01:00
Laurent Destailleur
d6e81c5da4 Fix var not defined 2020-01-21 00:20:18 +01:00
Laurent Destailleur
65fef47bdb Enable new pdf templates as stable 2020-01-20 01:05:30 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-18 15:17:07 +00:00
Scrutinizer Auto-Fixer
0aa156db78 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-16 01:54:00 +00:00
Laurent Destailleur
d07fa80a28 Removed export driver using phpexcel. 2020-01-15 21:09:11 +01:00
Laurent Destailleur
2c40e4be94 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 20:13:45 +01:00
Laurent Destailleur
a68da82bec Code comment of export 2020-01-15 20:11:04 +01:00
Laurent Destailleur
98eda68afb Fix linkg to public notes 2020-01-15 19:49:45 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
34829644ed Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/time.php
 2020-01-15 13:38:28 +01:00
Laurent Destailleur
8e269c5e64 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/modules/modSociete.class.php
	htdocs/filefunc.inc.php
 2020-01-15 13:19:37 +01:00
Laurent Destailleur
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-01-15 12:09:21 +01:00
gauthier
5455130a03 FIX : We want to be able to import data for extrafields of entity 0 too 2020-01-13 16:15:22 +01:00
Laurent Destailleur
56fb6dce61 FIX #12756 2020-01-13 15:38:46 +01:00
Laurent Destailleur
f9e3164c6e
Merge pull request #12783 from frederic34/patch-14 
NEW upload odt templates for shipments
 2020-01-13 13:42:07 +01:00
Laurent Destailleur
ab1a56c881
Merge pull request #12781 from frederic34/patch-11 
NEW upload odt models for invoices
 2020-01-13 13:41:49 +01:00
Laurent Destailleur
4f3f933ab9
Merge pull request #12780 from frederic34/patch-8 
NEW upload odt models for thirdparties
 2020-01-13 13:41:37 +01:00
Laurent Destailleur
3017d2ebe4
Merge pull request #12805 from OPEN-DSI/new-export-agenda-project-ref 
NEW add project ref in events export
 2020-01-13 11:50:39 +01:00
simicar29
7e29e57aff
Avoid adding unsubscribed contacts in mailing list 
Add an sql criterion to exclude unsubscribed email adresses from count of contacts (function getNbOfRecipients) and avoid their inclusion in mailing lists (function add_to_target)
 2020-01-07 16:13:48 +01:00
VESSILLER
c0751a69e4 NEW add project ref in events export 2020-01-07 10:56:46 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/invoice.php
 2020-01-01 22:37:13 +01:00
Laurent Destailleur
85d3b424f7 FIX: Substitution of login into link is wrong. 2020-01-01 22:27:08 +01:00
Laurent Destailleur
eae0800021 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-01 11:24:10 +01:00
Laurent Destailleur
3825e9af06 FIX logo not found in some cases 2020-01-01 03:00:10 +01:00
Laurent Destailleur
15f1153e82 FIX Avoid line feed when 100% 2019-12-31 17:22:12 +01:00
Laurent Destailleur
76052b8bb4 FIX Avoid line feed when 100% 2019-12-31 17:19:49 +01:00
Frédéric FRANCE
530eeffed7
NEW upload odt templates for sendings 2019-12-31 14:30:57 +01:00
Frédéric FRANCE
a7a474d032
Update doc_generic_contract_odt.modules.php 2019-12-31 14:28:14 +01:00
Frédéric FRANCE
57a5416cbc
Update doc_generic_proposal_odt.modules.php 2019-12-31 14:20:39 +01:00
Frédéric FRANCE
ee7fe66749
Update doc_generic_order_odt.modules.php 2019-12-31 14:19:31 +01:00
Frédéric FRANCE
596e2ccefc
Update doc_generic_invoice_odt.modules.php 2019-12-31 14:15:17 +01:00
Frédéric FRANCE
0c58df51d9
Update doc_generic_odt.modules.php 2019-12-31 14:14:30 +01:00
Frédéric FRANCE
b6f7394959
NEW upload odt models for invoices 2019-12-31 14:13:10 +01:00
Frédéric FRANCE
95335f402e
NEW upload odt models for thirdparties 2019-12-31 14:03:08 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
Laurent Destailleur
2df9df2db0 Debug v11 2019-12-23 12:24:27 +01:00
Frédéric FRANCE
3d19e1321b
NEW upload odt models for proposal 2019-12-19 11:10:55 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Alexandre SPANGARO
3fb72c349f Fix language traduction on import/export tools 2019-12-18 03:25:19 +01:00
Frédéric FRANCE
b6c9de3928
upload odt models for order 2019-12-17 14:49:18 +01:00
Laurent Destailleur
6e2e02fd40 Look and feel v11 2019-12-16 21:06:32 +01:00
Laurent Destailleur
1af67a4336
Merge pull request #12713 from frederic34/doxygen_warning 
doxygen
 2019-12-16 19:02:10 +01:00
Laurent Destailleur
44c967f1cc
Merge pull request #12716 from Dolibarr/scrutinizer-patch-19 
Scrutinizer Auto-Fixes
 2019-12-16 19:01:53 +01:00
Laurent Destailleur
c3cd6ad1af Fix example 2019-12-16 13:10:57 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Frédéric FRANCE
9e4fb8d4fe
doxygen 2019-12-15 10:02:20 +01:00
Frédéric FRANCE
8c7f0e669b
Update mod_chequereceipt_mint.php 2019-12-14 16:13:48 +01:00
Frédéric FRANCE
440b846e9a
Update mod_chequereceipt_mint.php 2019-12-14 16:12:38 +01:00
Frédéric FRANCE
ddc827e48e
Update mod_chequereceipt_thyme.php 2019-12-14 16:11:27 +01:00
Frédéric FRANCE
f15d65c2b9
doxygen 2019-12-14 16:09:48 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
a0d9a7a970
Merge pull request #12704 from frederic34/patch-20 
The property db does not exist on mod_arctic
 2019-12-14 13:55:08 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
Frédéric FRANCE
a3dd454f86
The property db does not exist on mod_arctic 2019-12-13 08:00:34 +01:00
Frédéric FRANCE
a63caf38d3
The variable $conf seems to be never defined 2019-12-12 20:39:28 +01:00
Laurent Destailleur
a612aefab7 Fix HTML5 2019-12-12 11:11:08 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
12f84d8254
doxygen 2019-12-11 23:04:27 +01:00
Mistral Oz - LWEP
b92ec604ec
New model "Excel 2007" : first col at wrong position 
The first column start at id 0 instead of id 1. At id 0, the first column move at Z position. 
Documentation : https://phpspreadsheet.readthedocs.io/en/latest/topics/migration-from-PHPExcel/#column-index-based-on-1
 2019-12-10 18:25:30 +01:00
Laurent Destailleur
dfeca5fae8 Fix phpcs 2019-12-09 17:42:38 +01:00
Laurent Destailleur
a77dc75bd4
Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template 2019-12-09 16:05:23 +01:00
Laurent Destailleur
d73bd3ee9a Fix a supplier ref is mandatory for import 2019-12-06 18:43:13 +01:00
Laurent Destailleur
ed4f04f90a Fix a supplier ref is mandatory for import 2019-12-06 18:41:22 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
606a13898c
Merge pull request #12394 from mapiolca/patch-15 
Fix problem of display photo in the model
 2019-12-03 16:16:57 +01:00