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
|
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 |
|
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 |
|
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 |
|