2
0
forked from Wavyzz/dolibarr
Commit Graph

4710 Commits

Author SHA1 Message Date
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
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