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
|
377b9a6b88
|
Add extrafields on PDF object lines desc for compatible pdf
|
2020-02-24 00:14:43 +01:00 |
|