Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

6602 Commits

Author SHA1 Message Date
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
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
Alexandre SPANGARO
d6d3fff9dc Merge branch 'develop' into 10.0_intracommreport 2020-02-03 21:15:07 +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
stickler-ci
ce3e658608 Fixing style errors. 2019-12-31 07:36:40 +00:00
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +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
Laurent Destailleur
41a176ce72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/modules/modStripe.class.php
	htdocs/product/stock/replenish.php
	htdocs/stripe/payout.php
 2019-12-03 13:58:15 +01:00
Laurent Destailleur
b1f2495771
Merge pull request #12598 from frederic34/patch-15 
The property db does not exist on mod_livraison_saphir
 2019-12-03 13:26:16 +01:00
Laurent Destailleur
87aaa5b11d
Merge pull request #12597 from frederic34/patch-14 
The property db does not exist on mod_supplier_proposal_saphir
 2019-12-03 13:26:03 +01:00
Laurent Destailleur
9400d44f83
Merge pull request #12596 from frederic34/patch-13 
The property db does not exist on mod_reception_moonstone
 2019-12-03 13:25:51 +01:00
Laurent Destailleur
a56d4407ca
Merge branch 'develop' into patch-11 2019-12-03 13:25:19 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
ptibogxiv
b67fb8be02
Fix stripe menu 2019-12-03 00:14:05 +01:00
Laurent Destailleur
32a539a8c0 Update website templates 2019-12-02 09:19:05 +01:00
Frédéric FRANCE
0b37d54841
The property db does not exist on mod_livraison_saphir 2019-12-01 20:58:45 +01:00
Frédéric FRANCE
5d9901bf59
The property db does not exist on mod_supplier_proposal_saphir 2019-12-01 20:57:14 +01:00
Frédéric FRANCE
318ba895e5
The property db does not exist on mod_reception_moonstone 2019-12-01 20:55:22 +01:00
Frédéric FRANCE
c780838e34
The property db does not exist on mod_propale_saphir 2019-12-01 20:50:18 +01:00
Laurent Destailleur
5cb014435b Try better fix for #12567 2019-12-01 19:29:53 +01:00
Frédéric FRANCE
1d0900445b
The variable $letter does not seem... 
The variable $letter does not seem to be defined for all execution paths
 2019-12-01 18:52:50 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Laurent Destailleur
3eec2430eb
Merge pull request #12585 from atm-john/develop_factoring_token_usage 
Factoring token usage
 2019-12-01 11:37:30 +01:00
Laurent Destailleur
790fdc881c # WARNING: head commit changed in the meantime 
Restore file for travis
 2019-12-01 10:50:56 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Maxime Kohlhaas
edb8bcb598 Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME 2019-11-30 22:58:32 +01:00
Laurent Destailleur
eed8f242b8 Update demo 2019-11-29 10:23:18 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM 
Enhance demo data for TakePOS
 2019-11-28 15:18:14 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-28 11:36:20 +00:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-27 22:54:05 +01:00
Frédéric FRANCE
32aca5f186
Update pdf_standard.class.php 2019-11-26 19:52:10 +01:00
Laurent Destailleur
b0b579bdbf Fix phpcs 2019-11-26 09:13:35 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
Laurent Destailleur
61f414488a Fix translation 2019-11-24 18:34:07 +01:00
Laurent Destailleur
712ae48e4e Fix default setup 2019-11-24 18:07:38 +01:00
Alexandre SPANGARO
2f064567ef NEW Add shipment widget 2019-11-21 07:50:44 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Laurent Destailleur
ae0fdf014f Debug email collector. Missing unique key. Fix initial setup. 2019-11-18 11:55:22 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Laurent Destailleur
1f5bea01f5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
	htdocs/user/card.php
 2019-11-14 21:30:16 +01:00
Laurent Destailleur
80b3e27341 Fix bad name of constant 2019-11-14 14:23:48 +01:00
Laurent Destailleur
7e0ae4bf0e FIX The pdf templates were using the large logo making PDF too large 2019-11-14 14:17:22 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Frédéric FRANCE
05ab4f79ef
categories for actioncomm 2019-11-13 18:44:11 +01:00
Scrutinizer Auto-Fixer
c66bce7ec6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:31:18 +00:00
Scrutinizer Auto-Fixer
038bda254d Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 22:59:36 +00:00
Laurent Destailleur
2ccef4e469 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2019-11-11 19:10:35 +01:00
Laurent Destailleur
5b6ace387e Debug BOM and MO module 2019-11-09 19:47:49 +01:00
BENKE Charlene
53fd8328bc
add certificate if present on document folder 2019-11-09 15:20:36 +01:00
Pierre Ardoin
88fb094a78
Fix problem of display photo in the model 
Fix a problem with photo in the model :
Before : Check in the current entity the product's repertory to find a photo
Now : Check all entities product's repertories to find a photo
 2019-11-08 22:02:30 +01:00
Laurent Destailleur
8f35c24b62 Add quick hack by hidden const as solution when numbering is locked. 2019-11-08 16:37:25 +01:00
Laurent Destailleur
e513917d12 Fix phpcs 2019-11-08 11:34:14 +01:00
Laurent Destailleur
3b44760e65 FIX #12356 2019-11-07 14:10:07 +01:00
Laurent Destailleur
f84087ba70 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 14:08:01 +01:00
Laurent Destailleur
1fa61077a0 FIX #12356 2019-11-07 14:07:50 +01:00
Scrutinizer Auto-Fixer
0b406172fd Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-07 11:59:59 +00:00
Laurent Destailleur
7c4942b7be Fix debug BOM/MO 2019-11-05 20:14:33 +01:00
Laurent Destailleur
84a8d4e7cb Debug BOM/MO 2019-11-05 19:18:12 +01:00
Laurent Destailleur
c0daa1e5d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-05 10:11:49 +01:00
Laurent Destailleur
b4d72e3e96 Fix link to setup of social network module 2019-11-05 10:00:46 +01:00
Frédéric FRANCE
d035aefd40
config file doesn't exists 2019-11-04 21:58:40 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks 
NEW add socialnetworks dictionary
 2019-11-04 21:10:22 +01:00
Laurent Destailleur
b0ea276233 Debug MO module 2019-11-04 14:13:36 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
58ffb73627 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
b8803fa8df Work on MO 2019-10-31 22:56:08 +01:00
Laurent Destailleur
716c2bb531 Work on MO 2019-10-31 22:46:34 +01:00
Laurent Destailleur
af09c77a0c Fix phpcs 2019-10-31 22:15:18 +01:00
Laurent Destailleur
c215d534fc Fix phpcs 2019-10-31 21:16:41 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
b296f62671 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-10-31 02:36:31 +01:00
Laurent Destailleur
645390c990 Work on BOM templates 2019-10-31 02:36:16 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
stickler-ci
ed9a136211 Fixing style errors. 2019-10-30 08:58:19 +00:00
Philippe GRAND
445d09cf8a add comment 2019-10-30 09:50:06 +01:00
Philippe GRAND
a80243e528 add comment 2019-10-30 09:48:34 +01:00
Laurent Destailleur
6a01132fdb
Merge pull request #12210 from grandoc/new_branch_24_10_2019 
add some comment
 2019-10-30 03:17:21 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent 
clean indent
 2019-10-30 02:57:59 +01:00
Laurent Destailleur
bc3f088f50 Enhance modulebuilder 
Work on MO
 2019-10-30 01:35:41 +01:00
Laurent Destailleur
66337ec234 NEW Add widgets for BOMs and MOs 2019-10-30 00:36:47 +01:00
Frédéric FRANCE
1ba9612f12
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-27 17:03:50 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
afa3ed499f Can export BOMs 2019-10-27 15:56:20 +01:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Philippe GRAND
5e44d63ec0 Merge remote-tracking branch 'upstream/develop' into new_branch_24_10_2019 2019-10-24 16:24:17 +02:00
Laurent Destailleur
88e848e346 FIX Extrafields missing in export of expense report 2019-10-24 16:00:10 +02:00
Laurent Destailleur
15609e319f FIX Extrafields missing in export of expense report 2019-10-24 15:57:34 +02:00
Philippe GRAND
ac839204d7 add some comment 2019-10-24 15:12:20 +02:00
Philippe GRAND
ffa5c8cbc0 add some comment 2019-10-24 15:10:05 +02:00
stickler-ci
3fb0b1ac73 Fixing style errors. 2019-10-24 13:07:19 +00:00
Philippe GRAND
480e21b88a add some comment 2019-10-24 15:06:56 +02:00
stickler-ci
9eb0385a88 Fixing style errors. 2019-10-24 13:02:34 +00:00
Philippe GRAND
f1db8e6f03 add some comment 2019-10-24 15:02:37 +02:00
stickler-ci
8a7360dd32 Fixing style errors. 2019-10-24 12:59:20 +00:00
Philippe GRAND
96ab43d495 add some comment 2019-10-24 14:58:15 +02:00
Laurent Destailleur
f23804a091 FIX #12152 2019-10-23 03:00:19 +02:00
Laurent Destailleur
fea12076ee FIX #12152 2019-10-22 20:24:52 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
 2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
Philippe GRAND
a0303e903a internationalization 2019-10-21 09:53:42 +02:00
Philippe GRAND
db22cdb8ea internationalization 2019-10-21 09:43:34 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
Laurent Destailleur
becd3f7d2f FIX Missing status and paid flag in export or expense report 2019-10-18 15:35:25 +02:00
Philippe GRAND
a07ab341f8 Standardization 2019-10-18 13:00:31 +02:00
Philippe GRAND
41d2cb2c29 Standardization 2019-10-18 12:56:40 +02:00
Philippe GRAND
f43d51bfec Standardization 2019-10-18 12:51:49 +02:00
Philippe GRAND
731f4587e2 Merge remote-tracking branch 'origin/new_branch_18_10_2019' into new_branch_18_10_2019 2019-10-18 12:44:40 +02:00
Philippe GRAND
18b183f516 Standardization 2019-10-18 12:43:25 +02:00
stickler-ci
0c61e798a6 Fixing style errors. 2019-10-18 09:42:15 +00:00
Philippe GRAND
3b56d91727 Standardization 2019-10-18 11:41:18 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Laurent Destailleur
de396dc9b3 Clean code for order of modules 2019-10-17 19:21:30 +02:00
Laurent Destailleur
87ec1de78e Start to work on solution to sort permissions by module 2019-10-17 18:43:07 +02:00
Laurent Destailleur
40fdcfac7e
Merge branch 'develop' into 10.0_closure2 2019-10-17 18:16:57 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
 2019-10-17 17:48:42 +02:00
Laurent Destailleur
f71423b3fd
Merge pull request #12160 from grandoc/new_branch_17_10_2019 
Internationalization
 2019-10-17 17:42:44 +02:00
Philippe GRAND
2efeeb0ad8 Internationalization 2019-10-17 14:47:03 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
TuxGasy
43ce1543d8 Fix width unit label in product import 2019-10-16 17:37:20 +02:00
Philippe GRAND
10fd472392 internationalization 2019-10-16 15:59:08 +02:00
Philippe GRAND
cd825ba4be internationalization 2019-10-16 15:46:46 +02:00
Laurent Destailleur
2aa594de9d
Merge pull request #12124 from c3do/patch-1 
New: Set a pricing rule by default for new clean installation
 2019-10-16 13:25:44 +02:00
Laurent Destailleur
d7871c4971
Merge pull request #12132 from grandoc/new_branch_15_10_2019 
Internationalization
 2019-10-16 13:24:10 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
b0de030f3e phpcs 2019-10-16 02:05:47 +02:00
Laurent Destailleur
ffc4820970 Fix counter of BOM 2019-10-16 02:05:23 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
 2019-10-15 03:51:57 +02:00
stickler-ci
30099a821b Fixing style errors. 2019-10-14 19:39:00 +00:00
Philippe GRAND
6761e1ef33 Internationalization 2019-10-14 21:38:21 +02:00
Philippe GRAND
7ce5ddbf02 Internationalization 2019-10-14 21:25:43 +02:00
Laurent Destailleur
07bb83a96d
Merge pull request #12113 from aspangaro/10.0_p25 
Remove a duplicate line
 2019-10-14 21:04:22 +02:00
Laurent Destailleur
4941a99cc7
Merge pull request #12126 from grandoc/new_branch_14_10_2019 
add missing translation
 2019-10-14 20:53:28 +02:00
Laurent Destailleur
5a55997540
Update pdf_eratosthene.modules.php 2019-10-14 20:53:18 +02:00
Laurent Destailleur
5c4edad0d4
Merge pull request #12105 from grandoc/new_branch_12_10_2019 
more internationalization
 2019-10-14 20:37:50 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-14 19:02:46 +02:00
Philippe GRAND
fd90ebe63b add missing translation 2019-10-14 15:57:29 +02:00
Philippe GRAND
e326c23245 add missing translation 2019-10-14 15:48:24 +02:00
Cédric
44476afdac
FIX: No pricing rule on new clean installation 
There is no pricing rule on new fresh installation of Dolibarr.
I think the pricing rule "PRODUCT_PRICE_UNIQ" should be set by default because it is needed to update a product through API REST.
 2019-10-14 15:35:04 +02:00
Laurent Destailleur
a33fb47777 Work on MO module 2019-10-14 12:10:14 +02:00
Alexandre SPANGARO
e50d32dc00 Remove a duplicate line 2019-10-13 13:20:45 +02:00
Alexandre SPANGARO
499eb87173 lang file for holidays is holiday 2019-10-13 08:20:37 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Philippe GRAND
33efd77fc7 more internationalization 2019-10-12 12:10:33 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Laurent Destailleur
2fa3b23cf1 Fix missing price level field 2019-10-11 19:36:36 +02:00
Laurent Destailleur
f334180cb8
Merge pull request #12072 from OPEN-DSI/new-categorie-import-parent 
NEW add parent category id or label in import category module
 2019-10-11 17:33:28 +02:00
Laurent Destailleur
fa928f7dc3
Update modCategorie.class.php 2019-10-11 17:33:13 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
a0f918c85a
Merge pull request #12094 from grandoc/new_branch_11_10_2019 
fix some translations
 2019-10-11 16:21:06 +02:00
VESSILLER
2fb776ee34 NEW add new rule fetchidfromcodeandlabel for categories import 2019-10-11 11:57:11 +02:00
Philippe GRAND
25b9be9de7 update code 2019-10-11 10:19:58 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-10 23:24:50 +02:00
Frédéric FRANCE
9a2fabff6f
doxygen 2019-10-10 18:42:29 +02:00
Laurent Destailleur
b34cbfad74 Rename const 2019-10-10 15:23:45 +02:00
Laurent Destailleur
d9a0dc2986 Fix trans 2019-10-10 15:20:44 +02:00
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
 2019-10-10 10:37:17 +02:00
VESSILLER
d77f7556d8 NEW add parent category id or label in import category module 2019-10-09 16:00:14 +02:00
Laurent Destailleur
9f4aadae18 Missing Nature, Duration and Type fields in export of products 2019-10-09 02:05:20 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 18:30:58 +02:00
Laurent Destailleur
138ac0d524
Merge pull request #12063 from laudeco/feature/export_user_bank_account 
NEW Add bank data of user into the expense report exports
 2019-10-08 15:19:46 +02:00
Laurent Destailleur
651dec8dc2 Doxygen 2019-10-08 11:27:52 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent De Coninck
c8fb1e852c export some other fields on the expense reports 
When the user requests the export of the expense reports, some fields
were missing such as the bank account information of the user.

This PR adds the support of all those fields on the expense report
export. Now when you export the expense report you have :
* The bank name
* The bank code
* The IBAN
* The BIC
* The owner
* The owner address
 2019-10-08 08:51:09 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
51be0fad99 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 20:52:39 +02:00
Laurent Destailleur
bb72efefc5 Fix phpcs 2019-10-07 20:52:27 +02:00
Laurent Destailleur
e5026157e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2019-10-07 20:49:30 +02:00
Laurent Destailleur
539f4355c3 Try to fix stickler 2019-10-07 20:48:44 +02:00
Laurent Destailleur
156eb7fa61
Merge branch '10.0' into hotfix/12041-security-generate-password 2019-10-07 20:22:19 +02:00
Laurent De Coninck
2ba8506608 validate the 0 as min value consecutive; meaning not take that rule into account 2019-10-07 17:53:23 +02:00
Laurent Destailleur
035da6a711
Merge pull request #11951 from aspangaro/11.0_accountancy_portal 
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
 2019-10-07 14:24:22 +02:00
Laurent Destailleur
12d243b8d4 FIX #12040 2019-10-07 13:13:46 +02:00
Laurent Destailleur
71e922635b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 12:57:52 +02:00
Laurent Destailleur
7015e71105 FIX #12041 2019-10-07 12:53:32 +02:00
Laurent Destailleur
e7aa78cb4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 12:37:20 +02:00
Laurent Destailleur
23de8694fa Fix module files 2019-10-07 12:37:01 +02:00
Laurent Destailleur
f4b752ee81 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/expedition/card.php
 2019-10-07 12:33:13 +02:00
VESSILLER
219b0d8925 FIX Import of product using units 2019-10-07 12:26:02 +02:00
Laurent Destailleur
b85c4f0864
Merge branch 'develop' into new-import-product-country-code 2019-10-07 10:41:35 +02:00
Laurent Destailleur
c3ae87816f
Merge pull request #12049 from frederic34/holidayz 
lang file for holidays is holiday
 2019-10-07 10:21:36 +02:00
Frédéric FRANCE
ec8569dd85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-06 15:56:21 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Frédéric FRANCE
8a9f08d5a3
lang file for holidays is holiday 2019-10-06 11:29:24 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
VESSILLER
0e23fbc6df NEW add country code in import product model 2019-10-04 10:04:02 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 17:21:31 +02:00
Sebastien Baguet
9daffcbe07 Fix for no subscription members 2019-10-03 00:29:41 +02:00
Alexandre SPANGARO
848acb6096 Update index 2019-10-02 08:49:33 +02:00
Alexandre SPANGARO
a6e429ff32 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-10-02 08:49:00 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Frédéric FRANCE
c57c8eee88
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 07:41:10 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
8dea427f58 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-30 21:23:27 +02:00
Laurent Destailleur
0846a081cb
Merge branch 'develop' into new_branch_29_06_2019 2019-09-30 21:06:51 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Laurent Destailleur
33908afb66 Update zapier logo 2019-09-30 19:30:31 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Alexandre SPANGARO
8e42ac8cd0 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-28 22:31:08 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
Laurent Destailleur
981c5c877a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-27 20:02:08 +02:00
Laurent Destailleur
24ad67e0e1 Fix missing $conf 2019-09-27 20:01:57 +02:00
Laurent Destailleur
d0d884742f FIX #11861 Not consistent code to manage measuring units 2019-09-27 19:45:33 +02:00
Laurent Destailleur
c0e7c558a1
Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception 
NEW widget box for supplier orders awaiting reception
 2019-09-27 15:32:43 +02:00
Laurent Destailleur
8e08636d36
Merge pull request #11922 from laudeco/feature/11880_add_custom_element_in_project_export 
[#11880] - support the referents also in the beluga export of a project
 2019-09-27 14:22:49 +02:00
Laurent Destailleur
138b494b98
Merge pull request #11936 from aspangaro/11.0_translation 
Translate and some fix
 2019-09-27 12:15:50 +02:00
Laurent Destailleur
881c90ab74
Merge pull request #11953 from grandoc/new_branch_24_09_2019 
add missing translation
 2019-09-27 11:56:01 +02:00
Laurent Destailleur
2b6b1a3e1c Fix syntax error 2019-09-27 11:12:21 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Frédéric FRANCE
5eb0fb462b
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-27 07:59:02 +02:00
Laurent Destailleur
7d91649520 NEW Add extrafields in export of expense report (and holiday) 2019-09-25 15:48:44 +02:00
Frédéric FRANCE
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-25 08:06:44 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Philippe GRAND
7ec43e8b59 add missing translation 2019-09-24 09:54:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
a005408d83 NEW Accountancy - Add an option to hide FAQ on index and add widget in area 2019-09-23 20:42:50 +02:00
Alexandre SPANGARO
1e49fd0d45 Translate 2019-09-20 15:07:58 +02:00
Alexandre SPANGARO
e32772fdc5 Translate 2019-09-20 09:44:49 +02:00
Alexandre SPANGARO
278312f38f Translate 2019-09-20 07:02:14 +02:00
Laurent De Coninck
49b75e3f52 support referent in the beluga export. 
The beluga export of a project, now supports additional referents, coming from the hooks. When the element is present in the view of all elements of the project, the beluga export will also export this element.

[see: X]
 2019-09-17 17:40:42 +02:00
Laurent Destailleur
24cb1390e4 FIX Update of leave request when CSRF with token is on 
FIX Export of leave request show the number of open days
 2019-09-17 13:17:25 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
Laurent Destailleur
eda17e9c54
Merge pull request #11850 from OPEN-DSI/new-stock-import-warehouse-parent 
NEW add parent id or ref column in warehouse import
 2019-09-15 15:44:33 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:37:10 +02:00
Frédéric FRANCE
de3a67f5bd
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-12 21:52:06 +02:00
Laurent Destailleur
5fd88f438f Clean code 2019-09-12 00:03:51 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary 2019-09-11 22:27:09 +02:00
ATM john
9db2e27289 add widget box for supplier orders awaiting reception 2019-09-10 21:47:08 +02:00
stickler-ci
017a0fb70f Fixing style errors. 2019-09-10 19:42:31 +00:00
Philippe GRAND
6634ef4de5 Merge remote-tracking branch 'origin/develop' into new_branch_29_06_2019 2019-09-10 21:40:04 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
VESSILLER
3ea2e0c915 NEW add parent id or ref column in warehouse import 2019-09-09 15:03:20 +02:00
Laurent Destailleur
66a9fabd06 If you develop your own emailing target selector and used 
parent::add_to_target(...), you must now use parent::addToTargets(...)
 2019-09-09 14:18:25 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
Laurent Destailleur
28ba5abb89 Clean code 2019-09-09 13:31:14 +02:00
Laurent Destailleur
2c0d7ba97d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 12:58:42 +02:00
Laurent Destailleur
21d84f63a5 Work on template 2019-09-09 12:58:32 +02:00
Laurent Destailleur
64506a3e00
Merge pull request #11843 from aspangaro/11.0_translation 
Translation
 2019-09-09 12:57:55 +02:00
Laurent Destailleur
1d311b2969 Fix scrutinizer 2019-09-08 21:21:33 +02:00
Alexandre SPANGARO
985cfab8e9 Traduction 2019-09-08 05:22:13 +02:00
Alexandre SPANGARO
3ddd123eb1 Traduction 2019-09-08 05:18:52 +02:00
Alexandre SPANGARO
d9fa32b555 Traduction 2019-09-08 05:00:24 +02:00
Alexandre SPANGARO
3a2b3d311a Traduction 2019-09-08 04:57:09 +02:00
Frédéric FRANCE
4054ebaf27
wip 2019-09-07 15:12:07 +02:00
Frédéric FRANCE
c6a02312a9
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-07 14:19:07 +02:00
Laurent Destailleur
f338a5f9ad Debug module datapolicy 2019-09-06 19:56:00 +02:00
Laurent Destailleur
89e1cdff61 Debug module datapolicy 2019-09-06 19:41:15 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
 2019-09-06 14:27:01 +02:00
Laurent Destailleur
f08c07f315 Fix bugs reported by scrutinizer 2019-09-06 10:42:51 +02:00
Laurent Destailleur
5b1d94a668 Fix translation 2019-09-06 02:27:49 +02:00
Laurent Destailleur
08c16ea2e1 Fix bad dir created 2019-09-06 02:03:26 +02:00
Laurent Destailleur
12868413bd Doxygen 2019-09-05 13:33:49 +02:00
Laurent Destailleur
1950952b05 Missing label 2019-09-04 15:11:06 +02:00
Laurent Destailleur
7d5877b8b1 Doxygen 2019-09-04 13:50:10 +02:00
Laurent Destailleur
bb7b34816d
Merge pull request #11785 from a-schild/develop 
Fix for issue #11783
 2019-09-03 17:43:49 +02:00
Laurent Destailleur
bd47bd096b NEW Can defined a position of numbering submodules for thirdparties 2019-09-03 15:58:20 +02:00
Laurent Destailleur
106938168f Fix phpcs 2019-09-03 15:36:49 +02:00
Laurent Destailleur
a9bb891760
Merge pull request #11767 from aspangaro/11.0_digitaria 
NEW Digitaria model for numbering accountancy thirdparty
 2019-09-03 15:01:10 +02:00
Laurent Destailleur
c4a4efe0dc
Merge pull request #11769 from Tim-Otte/develop 
NEW: Added odt support to supplier orders
 2019-09-03 13:04:33 +02:00
Tim Otte
0f02a621ba Seriously? One newline failed the stickler ci test? 2019-09-03 10:39:11 +02:00
Tim Otte
443f16bddf Removed debug output 2019-09-03 10:36:00 +02:00
Laurent Destailleur
210effc742 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-30 04:18:23 +02:00
a-schild
ad779bc714 Correctly initialize $addDescription in all cases 2019-08-29 09:46:10 +02:00
a-schild
c38e29185c Fix for #11783 2019-08-29 09:43:49 +02:00
Laurent Destailleur
bb893fd3a8 FIX Missing the filter fields in export of expense report and leaves 2019-08-27 18:16:34 +02:00
Tim Otte
5abfc04900
Merge branch 'develop' into develop 2019-08-27 16:37:41 +02:00
Alexandre SPANGARO
47b9af09a5 Fix stickler 2019-08-27 16:37:14 +02:00
Tim Otte
75152cb210 Added odt support to supplier orders 2019-08-27 16:22:16 +02:00
Alexandre SPANGARO
958361b45e Merge branch 'develop' into 11.0_digitaria 2019-08-27 14:11:27 +02:00
Alexandre SPANGARO
d7f8df2e45 NEW Digitaria model for numbering accountancy thirdparty 2019-08-27 14:03:33 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
2b8c57b714
Merge pull request #11724 from ptibogxiv/patch-228 
Fix stripelive_oauthcallback.php
 2019-08-26 16:34:40 +02:00
ptibogxiv
30b929c621
Update modAdherent.class.php 2019-08-23 13:57:22 +02:00
ptibogxiv
839ba76ae4
Update stripetest_oauthcallback.php 2019-08-23 08:58:08 +02:00
ptibogxiv
06fdd5ddbc
Update stripelive_oauthcallback.php 2019-08-22 22:50:41 +02:00
ptibogxiv
0be59646a8
Update stripelive_oauthcallback.php 2019-08-22 22:00:53 +02:00
Laurent Destailleur
ae7ba9ff54 Doc 2019-08-17 15:15:52 +02:00
Laurent Destailleur
8874a0f3c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 23:39:11 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
 2019-08-15 23:39:02 +02:00
Laurent Destailleur
6430c74793
Merge pull request #11168 from hregis/develop_menu 
NEW add new function "setEntity()" and better compatibility with Multicompany
 2019-08-15 21:00:05 +02:00
Laurent Destailleur
4534826583
Merge pull request #11633 from fmarcet/10.0 
FIX: Make protected all pfd models functions
 2019-08-15 19:04:32 +02:00
Laurent Destailleur
bb35d9be0c Fix copy of templates during activation of module 2019-08-15 01:50:01 +02:00
Regis Houssin
7c8b3c9a38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-08-13 07:34:02 +02:00
Ferran Marcet
f1c0442a77 FIX: Add comment before protected functions 2019-08-12 10:16:04 +02:00
Laurent Destailleur
8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
	htdocs/product/stats/facture.php
 2019-08-10 01:57:43 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 01:20:17 +02:00
VESSILLER
ae144a6910 NEW compute column value from others columns in import module 2019-08-08 17:31:16 +02:00
Frédéric FRANCE
7f23b77cbe
Update pdf_proforma.modules.php 2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d
Update pdf_einstein.modules.php 2019-08-05 14:58:50 +02:00
Ferran Marcet
fd1204bcd2 FIX: Make protected all pfd models functions 2019-08-05 13:41:25 +02:00
Laurent Destailleur
ded8a71b9a
Merge pull request #11614 from grandoc/patch_01_08_2019 
add some translation
 2019-08-01 16:39:05 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
5a719769bc Fix phpcs 2019-08-01 16:29:18 +02:00
Laurent Destailleur
6512435f9f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/cheque/doc/pdf_blochet.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-08-01 16:27:55 +02:00
Philippe GRAND
18a56c7ef2 add some translation 2019-08-01 15:59:37 +02:00
Philippe GRAND
b32dbbfb74 Merge remote-tracking branch 'upstream/develop' into develop 2019-08-01 15:43:30 +02:00
Laurent Destailleur
90ddc0a214 FIX #10930 2019-08-01 14:27:57 +02:00
Regis Houssin
d9ea61e47c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop_menu

Conflicts:
	htdocs/commande/class/commande.class.php
 2019-07-31 12:49:56 +02:00
Laurent Destailleur
6b789a13a1
Merge pull request #11562 from atm-quentin/FIX_pdf_cheque 
FIX name was able to be in field but went back to new line
 2019-07-30 22:00:58 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
 2019-07-30 20:55:15 +02:00
Laurent Destailleur
5f2439bf0a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 20:37:44 +02:00
Marc de Lima Lucio
703506c0e2 FIX: import filter error 2019-07-30 14:11:21 +02:00
Marc de Lima Lucio
449ef92007 FIX: categories import: prevent mismatch between category type and object type 2019-07-30 12:31:03 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
f825711206 Code comment 2019-07-29 11:01:29 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
atm-quentin
1f7cd1a3f8 FIX name was able to be in field but went back to new line 2019-07-26 11:05:16 +02:00
Philippe GRAND
0baea71d0f Merge remote-tracking branch 'upstream/develop' into develop 2019-07-26 07:54:14 +02:00
Laurent Destailleur
0b69bf9957 FIX #11553 2019-07-25 18:17:17 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
4a8377e4fd Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:52:40 +02:00
Florian Mortgat
65e9d8f239 FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined) 2019-07-25 11:14:59 +02:00
Laurent Destailleur
bef3423764 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-07-22 19:12:27 +02:00
Laurent Destailleur
9f95b10d0e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/comm/action/peruser.php
	htdocs/compta/prelevement/card.php
	htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
 2019-07-22 19:11:27 +02:00
Laurent Destailleur
5dcf4d6646 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-22 19:06:48 +02:00
Laurent Destailleur
b4e0c5ef6c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-22 18:51:32 +02:00
Alexandre SPANGARO
8b8aaafc05 Merge branch 'develop' into 10.0_intracommreport 2019-07-20 05:47:31 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries 2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
f745d01bf3 Prepare change of properties "titre" into "title" 2019-07-19 13:22:54 +02:00
Florian Mortgat
b100cdb9db FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set. 2019-07-19 11:58:21 +02:00
Regis Houssin
cbda42d146 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-07-19 09:37:34 +02:00
Alexandre SPANGARO
21bd46fc15 Merge remote-tracking branch 'upstream/develop' into 11.0_salaries 2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda NEW Extrafields on salaries 2019-07-17 14:09:25 +02:00
Laurent Destailleur
d694360c66 Fix warning 2019-07-15 23:46:54 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
e1d4917704 FIX Missing field "Conciliated" into bank transaction export 2019-07-14 00:39:42 +02:00
Laurent Destailleur
4387d40b9a Translation lignes -> lines 2019-07-05 21:55:08 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
d9560dbb61 Fix var not initialized 2019-07-02 18:02:06 +02:00
John Botella
9c2e83dcae Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-07-01 09:51:26 +02:00
Philippe GRAND
6d625d7d1e Merge remote-tracking branch 'upstream/develop' into develop 2019-06-30 12:04:55 +02:00
Laurent Destailleur
3461a61cbf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 18:35:54 +02:00
Laurent Destailleur
e9c6a10bdd Fix phpcs 2019-06-29 18:35:36 +02:00
Laurent Destailleur
b177787f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
	htdocs/product/class/product.class.php
 2019-06-29 18:28:51 +02:00
Laurent Destailleur
72084f4684 Fix protected 2019-06-29 16:49:32 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
b37f55d13a Add log 2019-06-29 16:06:40 +02:00
Philippe GRAND
bebd219e5a translations 2019-06-29 10:30:26 +02:00
Philippe GRAND
bd43e90c2b translations 2019-06-29 10:28:29 +02:00
Philippe GRAND
59424f228e translations 2019-06-29 10:21:26 +02:00
Philippe GRAND
05e9885ba7 translations 2019-06-29 10:18:45 +02:00
Philippe GRAND
ecc4d4227b translations 2019-06-29 10:14:46 +02:00
Philippe GRAND
837c1aca35 translation 2019-06-29 09:48:52 +02:00
Laurent Destailleur
cd024da628
Merge branch 'develop' into new_branch_27_06_2019 2019-06-28 13:39:27 +02:00
Philippe GRAND
2c237b8420 translations 2019-06-27 09:51:48 +02:00
Philippe GRAND
5a4ba837cc translations 2019-06-27 09:47:00 +02:00
Philippe GRAND
6e8d86fb4a translations 2019-06-27 09:43:50 +02:00
Philippe GRAND
f1e40b4b22 translations 2019-06-27 09:31:42 +02:00
Philippe GRAND
5a8cc4934b translations 2019-06-27 09:29:00 +02:00
Philippe GRAND
c20f9a4842 translations 2019-06-27 09:22:44 +02:00
Alexandre SPANGARO
9da91c06ed Merge branch 'develop' into 10.0_intracommreport 2019-06-26 15:11:43 +02:00
John Botella
ee98f3e6d7 fix travis recommendations 2019-06-26 10:48:22 +02:00
John Botella
7e14a598e2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-26 09:43:43 +02:00
John Botella
4c4444a53f fix travis recommendations 2019-06-26 09:36:53 +02:00
Laurent Destailleur
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +02:00
Laurent Destailleur
7a0962a393 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/modAccounting.class.php
 2019-06-25 23:13:55 +02:00
Laurent Destailleur
d5479cd9ae Fix import of ledger 2019-06-25 22:37:13 +02:00
Laurent Destailleur
20471c54e1 Fix import code (regex of data imported + import of constant) 
Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2019-06-25 22:27:00 +02:00
Laurent Destailleur
fc574946b1 Fix import of ledger 2019-06-25 22:23:51 +02:00
Laurent Destailleur
0ae0951d7d Fix import code (regex of data imported + import of constant) 2019-06-25 22:23:30 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
229dd4d3f5
Merge branch 'develop' into 10.0_accounting6 2019-06-24 19:59:11 +02:00
Laurent Destailleur
f66281d7e5
Update modAccounting.class.php 2019-06-24 19:50:22 +02:00
Laurent Destailleur
cade08342c
Merge pull request #11390 from grandoc/develop 
translation
 2019-06-24 15:30:30 +02:00
John Botella
ec7446762c Fix travis 2019-06-24 14:36:06 +02:00
Laurent Destailleur
01b8522216 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 13:56:39 +02:00
John Botella
9c414a7a57 Change function to camel case 2019-06-24 12:22:33 +02:00
John Botella
a83e7f3665 Add retained warranty to PDF 2019-06-24 12:00:55 +02:00
John Botella
7b6925b8f7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-24 10:29:43 +02:00
Alexandre SPANGARO
4a84dcaa62 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-06-23 21:47:34 +02:00
Laurent Destailleur
43fc0466e5 Fix position of modules 2019-06-23 20:05:15 +02:00
Philippe GRAND
e877f108ac translation 2019-06-22 12:18:56 +02:00
Philippe GRAND
9d698c257c translation 2019-06-22 12:10:32 +02:00
Philippe GRAND
8de36dc7c1 translation 2019-06-22 12:10:09 +02:00
Philippe GRAND
2d3b0b8f9e translation 2019-06-22 12:09:50 +02:00
Philippe GRAND
26af2d8fe3 translation 2019-06-22 12:09:28 +02:00
Philippe GRAND
5379d4085f translation 2019-06-22 12:08:57 +02:00
Philippe GRAND
a8d50228db translation 2019-06-22 12:08:36 +02:00
Philippe GRAND
4d4b5abb7e translation 2019-06-22 12:08:08 +02:00
Philippe GRAND
d75f4eb1c8 translation 2019-06-22 12:07:46 +02:00
Philippe GRAND
3cc97ec351 translation 2019-06-22 12:07:02 +02:00
Philippe GRAND
592591ff69 translation 2019-06-22 12:06:37 +02:00
Philippe GRAND
053b129f52 translation 2019-06-22 12:06:01 +02:00
Philippe GRAND
a9222c602f translation 2019-06-22 12:04:26 +02:00
Laurent Destailleur
403d41ec30 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 11:55:33 +02:00
Laurent Destailleur
4499447a89 Fix sort order of import profiles 
Fix picto in import profile for accounting
 2019-06-21 14:27:38 +02:00
Laurent Destailleur
bbbd066ac9
Merge pull request #11119 from openthink-laurent/add-customer-code-customer-orders-documents 
Add customer code in customer orders documents
 2019-06-21 13:33:57 +02:00
Laurent Destailleur
7ffcd3603b
Add option DOC_SHOW_CUSTOMER_CODE 
Because we have a lot of information and the REF is better to retrieve/search an order and know the customer code, i added a hidden option to show this field.
 2019-06-21 13:33:24 +02:00
Laurent Destailleur
f9095408b6 Fix sort order of export profiles 
Add missing pos information into export of invoice
Add missing label of project in export of invoice
 2019-06-21 13:25:40 +02:00
Laurent Destailleur
ad4bd05efb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:29:06 +02:00
Laurent Destailleur
c725db166d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-21 11:26:44 +02:00
Laurent Destailleur
70c950bd7c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:26:25 +02:00
Laurent Destailleur
9093be2f0a FIX Add missing end date of subscription in export 2019-06-21 11:23:49 +02:00
Alexandre SPANGARO
20b516885f WIP 2019-06-20 09:33:01 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber 
Allow zero as account number
 2019-06-20 03:09:37 +02:00
Laurent Destailleur
daab58974e
Merge pull request #11366 from aspangaro/10.0_other2 
Missing language key
 2019-06-20 03:02:13 +02:00
Alexandre SPANGARO
abfb708044 Merge branch 'develop' into 10.0_intracommreport 2019-06-19 21:43:40 +02:00
Laurent Destailleur
f9cc120d75 Debug module ticket 2019-06-19 12:53:28 +02:00
Alexandre SPANGARO
13836d3e21 Missing language ley 2019-06-19 06:21:53 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Regis Houssin
6597c9f60d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-06-17 06:45:08 +02:00
Laurent Destailleur
e8b139d1c6 Fix repeated logs and fetch 2019-06-13 22:48:31 +02:00
Laurent Destailleur
ab9742f4df
Try to keep proportion of logo 2019-06-13 10:09:20 +02:00
Laurent Destailleur
2bc821d900
Try to keep proportions of logo 2019-06-13 10:08:35 +02:00
Francis Appels
3f63be6045 fix typo 2019-06-12 22:10:40 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
Laurent Destailleur
91a4e8bc0a Merge 2019-06-12 12:09:56 +02:00
Laurent Destailleur
6d5637c389 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/actions_massactions.inc.php
 2019-06-12 12:03:46 +02:00
Laurent Destailleur
2d52537106 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:08 +02:00
Laurent Destailleur
8447259f25 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:34 +02:00
Laurent Destailleur
420f3bbdab FIX #11316 2019-06-12 10:05:53 +02:00
Laurent Destailleur
0edd94c4f8
Merge pull request #11303 from atm-florian/10.0 
fix various little stuff from scrutinizer (undeclared vriable, misspelling variable, mistype declaration)
 2019-06-07 15:21:30 +02:00
Laurent Destailleur
3d8910d327 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-06-06 19:19:05 +02:00
Laurent Destailleur
3ff154c1d0 Fix sql error 2019-06-06 19:05:47 +02:00
florian HENRY
f2171d466b fix variable name 2019-06-05 17:05:26 +02:00
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
 2019-06-04 19:03:27 +02:00
John BOTELLA
d7a393bbd3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-04 14:00:18 +02:00
Regis Houssin
7b8b1a9052 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-06-03 11:04:28 +02:00
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Laurent Destailleur
300f46cb01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:25 +02:00
Maxime Kohlhaas
15fd24a511 Fix : remove hardcoded llx_ prefix 2019-05-31 12:14:51 +02:00
Laurent Destailleur
fd0eb47b35 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/card.php
 2019-05-29 09:57:48 +02:00
Laurent Destailleur
6e9cd819c1 Fix phpcs 2019-05-29 09:55:09 +02:00
Laurent Destailleur
19ff0120ff # WARNING: head commit changed in the meantime 
Removed uselesss files (replaced by DebugBar)
 2019-05-26 11:42:00 +02:00
Laurent Destailleur
f2e03b3909 Removed useless files (replaced with DebugBar) 2019-05-26 11:24:57 +02:00
Laurent Destailleur
b67363d769 Fix rename export php lib to avoi duplicate with old library. 2019-05-25 18:54:43 +02:00
Laurent Destailleur
c04d082ad1 FIX Import of chart of account 2019-05-24 18:14:15 +02:00
Laurent Destailleur
49991eabf8 Fix import of accounting account from ref in import profiles 2019-05-24 17:09:18 +02:00
Laurent Destailleur
63824861a6 Fix import of chart of account. The account parent was not managed. 2019-05-24 16:58:06 +02:00
Laurent Destailleur
ccfb4f575b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-05-24 15:00:14 +02:00
Laurent Destailleur
89455672a2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-24 14:58:21 +02:00
Marc de Lima Lucio
49385fcab3 FIX: situation invoices: bad detailed VAT in situations following the first one 2019-05-23 14:37:40 +02:00
Alexandre SPANGARO
65070afce4 WIP 2019-05-22 17:22:49 +02:00
Alexandre SPANGARO
a182b89bb0 Merge branch 'develop' into 10.0_closure2 2019-05-22 13:52:13 +02:00
Regis Houssin
4f2f23f522 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-05-22 08:45:31 +02:00
Laurent Destailleur
657bd5c2fe Move module from develop to experimental 2019-05-21 15:50:16 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Alexandre SPANGARO
11015dd072 WIP 2019-05-21 09:55:41 +02:00
Regis Houssin
2cf630c213 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-05-20 16:10:47 +02:00
Laurent Destailleur
ec922d3d17 Add CONTRACT_HIDE_PLANNED_DATE_ON_PDF and CONTRACT_HIDE_REAL_DATE_ON_PDF 2019-05-20 14:54:09 +02:00
Alexandre SPANGARO
a239e0e81f WIP Admin 2019-05-20 13:33:54 +02:00
Frédéric FRANCE
aef850f6d3
zapier for dolibarr 2019-05-19 21:12:22 +02:00
Alexandre SPANGARO
f9e3a958c4 NEW Module Intracomm report 2019-05-19 10:44:09 +02:00
ATM John BOTELLA
f714b45efb FIX scrutinizer feedback 2019-05-18 15:53:07 +02:00
Laurent Destailleur
26d4875f8f Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 02:27:23 +02:00
Laurent Destailleur
6c4a4c34c4 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-18 02:26:40 +02:00
Maxime Kohlhaas
095fd2769a Fix project beluga order status 2019-05-18 01:11:34 +02:00
Laurent Destailleur
c50a3c4a78
Merge pull request #11190 from atm-florian/develop 
add info into change log
 2019-05-18 00:47:24 +02:00
florian HENRY
0c3500fc5d fix : #10562 2019-05-18 00:45:41 +02:00
Nicolas ZABOURI
1f789fa266 FIX syntax 2019-05-17 11:24:24 +02:00
Laurent Destailleur
53b7f3fe92
Merge pull request #11173 from aspangaro/10.0_accountancy_cat 
NEW Add accoutancy sell intra and export in product import
 2019-05-16 21:14:46 +02:00
Laurent Destailleur
c24c81692d
Update modAccounting.class.php 2019-05-16 21:13:57 +02:00
Alexandre SPANGARO
6f9010c362 NEW add category in export of chart of accounts 2019-05-13 22:02:43 +02:00
Alexandre SPANGARO
d99424cdf0 NEW Add accoutancy sell intra and export in product import 2019-05-13 21:19:18 +02:00
Laurent Destailleur
30e08d8f9c
Merge pull request #11167 from andreubisquerra/master 
TakePOS as stable
 2019-05-13 11:43:17 +02:00
Laurent Destailleur
f0cdaff936 Fix status of crons 2019-05-13 10:26:30 +02:00
Regis Houssin
156b25a702 FIX use "multidir_output" instead "dir_output" 2019-05-12 16:36:29 +02:00
Regis Houssin
3cb6ca34e9 FIX multicompany compatibility 2019-05-12 16:06:16 +02:00
Regis Houssin
b73df2698d FIX better compatibility with Multicompany 2019-05-12 14:25:41 +02:00
andreubisquerra
166ac1b8c2 TakePOS as stable as indicated in the Changelog 2019-05-11 21:33:26 +02:00
Laurent Destailleur
0bd4c61009 Fix default setup of module workflow was not set 2019-05-10 18:15:09 +02:00
Laurent Destailleur
aaeb7dc9d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/holiday.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-10 17:45:33 +02:00
Juanjo Menent
e36df726a1 Merge remote-tracking branch 'upstream/9.0' into 9.0 2019-05-09 20:42:04 +02:00
Juanjo Menent
2b182c1cc1 FIX: #11097 2019-05-09 20:39:30 +02:00
Laurent Destailleur
bc49f47718 Fix phpcs 2019-05-09 19:48:13 +02:00
Laurent Destailleur
52153d6aa2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-09 12:38:27 +02:00
Laurent Destailleur
677b333d0a FIX: Add hidden option MAIN_PDF_HIDE_SITUATION to hide situation (quick 
hack to fix output pb).
 2019-05-09 12:38:00 +02:00
Laurent Destailleur
6e69db8a1a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/filefunc.inc.php
 2019-05-09 12:27:14 +02:00
Laurent Destailleur
f1fd4108ae Debug/Clean code 2019-05-09 12:17:20 +02:00
Laurent Destailleur
d3bbb93ada Fix template for situation 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-09 12:16:43 +02:00
Laurent Destailleur
ed98817f0d Fix template for situation 2019-05-09 10:15:38 +02:00
Laurent Destailleur
c3693cb007 Fix phpcs 2019-05-08 19:10:12 +02:00
Laurent Destailleur
590b1d1e90 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2019-05-08 18:24:50 +02:00
Laurent Destailleur
f2e24ed96e Fix bad contact used 2019-05-08 18:20:28 +02:00
Laurent Destailleur
dc1ee29fef Fix default permission of new users 2019-05-07 23:03:45 +02:00
Alexandre SPANGARO
4baffae297 Merge remote-tracking branch 'upstream/develop' into 10.0_closure2 2019-05-05 22:43:02 +02:00
Alexandre SPANGARO
4e16992796 WIP 2019-05-05 14:07:42 +02:00
Laurent Léonard
8d659d8078 Fix date format in customer orders documents 2019-05-04 07:12:13 +02:00
Laurent Léonard
a7a8eb3648 Add customer code in customer orders documents 2019-05-04 06:33:23 +02:00
Laurent Destailleur
9115df7439 Debug v10 2019-05-03 11:25:53 +02:00
Laurent Destailleur
8c76c404bd
Merge pull request #11088 from defrance/patch-141 
planned_timespent not present on task
 2019-05-02 14:01:19 +02:00
Laurent Destailleur
425dd6faf7
Merge branch 'develop' into patch-2 2019-05-02 12:38:38 +02:00
Laurent Destailleur
ceeb9752ce Fix PHPCS 2019-05-02 12:28:40 +02:00
Frédéric FRANCE
ac304f58b0
clean new commits 2019-04-30 20:37:59 +02:00
Laurent Destailleur
0cd1fc79f2 NEW Add a security permission to edit php dynamic content on website. 2019-04-30 13:05:13 +02:00
BENKE Charlene
f8f40a9239
planned_timespent not present on task 
duration is the good one
 2019-04-30 11:27:33 +02:00
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:30:40 +02:00
Laurent Destailleur
d55c440740 Fix some product and services export profiles 2019-04-29 21:23:01 +02:00
Laurent Destailleur
101f6a5af3 FIX Several fixes on import of services/products 2019-04-29 20:41:36 +02:00
Laurent Destailleur
5d40124b22 Fix import of product price with multilevel prices 2019-04-29 20:15:03 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
ab1f371ea5 Fix encoding on expense report PDF 2019-04-24 20:58:27 +02:00
Laurent Destailleur
0090b26946
Merge pull request #11049 from frederic34/patch-5 
Update mod_expedition_ribera.php
 2019-04-24 10:10:11 +02:00
Laurent Destailleur
ad9dfc826a
Merge pull request #11051 from frederic34/patch-7 
Update mod_commande_saphir.php
 2019-04-24 10:09:58 +02:00
Laurent Destailleur
7ad214b2f1
Merge pull request #11052 from frederic34/patch-8 
Update mod_chequereceipt_thyme.php
 2019-04-24 10:09:38 +02:00
Laurent Destailleur
49c7d07e8c
Merge pull request #11050 from frederic34/patch-6 
Update mod_contract_magre.php
 2019-04-24 10:09:28 +02:00
Laurent Destailleur
a1bff2ca36
Merge pull request #11048 from frederic34/patch-2 
Update mod_bom_advanced.php
 2019-04-24 10:09:07 +02:00
Laurent Destailleur
6d397316d6
Merge pull request #11053 from frederic34/patch-9 
In export modules, id is string
 2019-04-24 10:08:30 +02:00
Laurent Destailleur
742de5c777 Fix pdf of expense report 2019-04-23 16:04:53 +02:00
Frédéric FRANCE
53c851de7b
Update export_csv.modules.php 2019-04-20 11:42:25 +02:00
Frédéric FRANCE
a0ce52bb23
Update export_excel.modules.php 2019-04-20 11:41:37 +02:00
Frédéric FRANCE
73b32f0679
Update export_excel2007.modules.php 2019-04-20 11:41:19 +02:00
Frédéric FRANCE
06a8513575
Update export_excel2007new.modules.php 2019-04-20 11:40:59 +02:00
Frédéric FRANCE
b05a5e49ff
Update export_tsv.modules.php 2019-04-20 11:39:38 +02:00
Frédéric FRANCE
e5559ac2f9
Update mod_chequereceipt_thyme.php 
The property db does not exist on mod_chequereceipt_thyme.
 2019-04-20 09:36:47 +02:00
Frédéric FRANCE
fbf718f330
Update mod_commande_saphir.php 2019-04-20 09:34:23 +02:00
Frédéric FRANCE
bed3ed705c
Update mod_contract_magre.php 
The property db does not exist on mod_contract_magre.
 2019-04-20 09:31:53 +02:00
Frédéric FRANCE
9b9d4ddc45
Update mod_expedition_ribera.php 
The property db does not exist on mod_bom_advanced.
 2019-04-20 09:29:24 +02:00
Frédéric FRANCE
e9b13baac2
Update mod_bom_advanced.php 
The property db does not exist on mod_bom_advanced.
 2019-04-20 09:27:15 +02:00
Laurent Destailleur
734b1ca7c1 Fix phpcs 2019-04-19 22:18:08 +02:00
Laurent Destailleur
6ed616a969
Merge pull request #11042 from aspangaro/10.0_assets 
Assets - Debug - Look & field v10
 2019-04-19 13:02:50 +02:00
Laurent Destailleur
99f5bf2a6c
Merge pull request #11027 from AXeL-dev/patch-8 
Fix debugbar module class
 2019-04-19 13:00:37 +02:00
Frédéric FRANCE
315349a681
replace @public by @var 2019-04-18 18:41:02 +02:00
Alexandre SPANGARO
3729e32368 Assets - Debug - Look & field v10 2019-04-18 14:13:48 +02:00
Alexandre SPANGARO
660a1cea1d NEW Accounting - Add rights on export, delete operations in ledger 2019-04-17 07:26:39 +02:00
AXeL-dev
bef38c9abe debugbar module class: remove unreached part of code (may generate errors on call) 2019-04-17 00:33:49 +01:00
Laurent Destailleur
b5bf6830e9 Introduce method convertBackOfficeMediasLinksToPublicLinks so links to 
media added from filemanager in notes are visible by PDFs builder.
 2019-04-17 01:13:59 +02:00
Laurent Destailleur
3d5a1a5550
Merge pull request #10988 from OPEN-DSI/new-societe-export-fields 
New company fields in contact export
 2019-04-11 16:29:01 +02:00
Laurent Destailleur
2b2838058c
Merge pull request #10986 from grandoc/new_branch_09_04_2019 
New branch 09 04 2019
 2019-04-11 16:28:18 +02:00
Laurent Destailleur
2eeb4b8734 Debug ticket module 2019-04-10 15:45:55 +02:00
Laurent Destailleur
26594fab98 Debug module ticket 2019-04-10 15:11:38 +02:00
Lionel VESSILLER
86d4f5d213 New company fields in contact export 2019-04-09 10:13:26 +02:00
Philippe GRAND
bb5e60ad54 update code 2019-04-09 09:39:38 +02:00
Philippe GRAND
9b8297ee15 update code 2019-04-09 09:39:00 +02:00
Philippe GRAND
2e7256a094 update code 2019-04-09 09:38:35 +02:00
Philippe GRAND
1b2aa27c2f update code 2019-04-09 09:37:21 +02:00
Philippe GRAND
3ff5c6b42b update code 2019-04-09 09:36:51 +02:00
Philippe GRAND
144ebb2f89 update code 2019-04-09 09:35:39 +02:00
Philippe GRAND
1d84dcbe17 update code 2019-04-09 09:34:26 +02:00
Philippe GRAND
c26afe15ff update code 2019-04-09 09:33:20 +02:00
Philippe GRAND
350a04108f update code 2019-04-09 09:32:18 +02:00
Philippe GRAND
edd5661f1a update code 2019-04-09 09:31:33 +02:00
Philippe GRAND
3a209d2454 update code 2019-04-09 09:30:32 +02:00
Philippe GRAND
42df91e4e2 update code 2019-04-09 09:29:01 +02:00
Philippe GRAND
30e2d8fa6b update code 2019-04-09 09:28:01 +02:00
Philippe GRAND
327ac2973e update code 2019-04-09 09:27:25 +02:00
Philippe GRAND
2ed71b0039 update code 2019-04-09 09:26:39 +02:00
Philippe GRAND
baecb20562 update code 2019-04-09 09:24:41 +02:00
Philippe GRAND
0de76fc128 update code 2019-04-09 09:23:50 +02:00
Philippe GRAND
f833bbcb32 update code 2019-04-09 09:21:34 +02:00
Philippe GRAND
68c1332244 update code 2019-04-09 09:19:16 +02:00
Laurent Destailleur
a19cedfc13 Fix phpcs 2019-04-09 00:48:12 +02:00
Laurent Destailleur
c0b3ee23e5 Fix phpcs 2019-04-08 23:50:18 +02:00
Laurent Destailleur
d01b54ca5b Fix phpcs 2019-04-08 18:02:27 +02:00
Laurent Destailleur
1274d71a10 Fix phpcs 2019-04-08 16:00:01 +02:00
Laurent Destailleur
2b87c8b663
Merge pull request #10810 from mwelters/patch-1 
NEW improve Expensereport, Inverse Receiver
 2019-04-08 14:04:08 +02:00
Laurent Destailleur
a7ced8ab5d
Merge pull request #10963 from aspangaro/v10_p3 
NEW: Accounting - Invert module name
 2019-04-08 13:39:51 +02:00
Laurent Destailleur
2606de2119
Update modAccounting.class.php 2019-04-08 13:35:06 +02:00
Laurent Destailleur
976ef92df6
Merge pull request #10958 from atm-john/new_look_and_feel_pdf 
New pdf document column system : supplier order and expedition
 2019-04-08 13:31:47 +02:00
Laurent Destailleur
54714bc755 Deprecated property ->fk_departement is now ->state_id everywhere. 2019-04-05 20:06:13 +02:00
Laurent Destailleur
67760d6f41 Fix phpcs 2019-04-05 19:53:45 +02:00
Laurent Destailleur
997d6cca0a Fix $db not defined 2019-04-05 19:49:47 +02:00
Alexandre SPANGARO
4335ea9064 NEW: Accounting - Invert module name 2019-04-04 17:13:20 +02:00
John BOTELLA
3299b765f1 New pdf models 2019-04-04 10:16:20 +02:00
John BOTELLA
a668cc28b1 Add table title auto height 2019-04-03 16:19:49 +02:00
Laurent Destailleur
76bf412f95 Fix phpcs 2019-04-03 14:40:15 +02:00
Laurent Destailleur
bfed3685a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-03 13:27:13 +02:00
Laurent Destailleur
7120078b0f NEW Simplification of styles architcture: Showing or not the menuhider 
is completely decided by CSS and screen size instead of PHP+CSS.
 2019-04-03 13:26:50 +02:00
Laurent Destailleur
64889f4639
Merge pull request #10947 from grandoc/new_branch_01_04_2019 
update comments
 2019-04-03 11:05:05 +02:00
Philippe Grand
ebe50a4efe
Update pdf_sponge.modules.php 2019-04-02 15:33:10 +02:00
Philippe Grand
b978014fb9
Update pdf_eratosthene.modules.php 2019-04-02 15:32:01 +02:00
markus
c08b69d00b Rely on MAIN_INVERT_SENDER_RECIPIENT 2019-04-01 19:59:58 +02:00
Laurent Destailleur
8fe1be1a67 Removed deprecated use of string in dol_print_date(). Only date allowed. 2019-04-01 19:27:34 +02:00
Philippe GRAND
b154ae752a update comments 2019-04-01 09:43:07 +02:00
Philippe GRAND
e8e5e5cfb9 update comments 2019-04-01 09:42:01 +02:00
Philippe GRAND
e2c5c49c52 update comments 2019-04-01 09:40:50 +02:00
Philippe GRAND
2b41e9166d update comments 2019-04-01 09:39:22 +02:00
Philippe GRAND
eb901e7c4e update comments 2019-04-01 09:38:23 +02:00
Philippe GRAND
46488f6a0c update comments 2019-04-01 09:36:52 +02:00
Philippe GRAND
2c41610ac8 update comments 2019-04-01 09:21:08 +02:00
Philippe GRAND
ae681eaf06 update comments 2019-04-01 09:18:56 +02:00
Philippe GRAND
f828e6ee90 update comments 2019-04-01 09:15:48 +02:00
Laurent Destailleur
ce62e7f7ec
Merge pull request #10939 from OPEN-DSI/new-exports-fields 
New add fields in contact export
 2019-03-31 19:00:16 +02:00
Lionel VESSILLER
a52935f6e4 New add fields in contact export 
- thirdparty fields (address, phone, email, typent)
- contact field (status)
 2019-03-28 18:29:36 +01:00
Alexandre SPANGARO
9f9dd2cd30 NEW: Add import of accounting account for intra/export selling on product card 2019-03-28 11:41:59 +01:00
markus
f942917f53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-24 17:42:49 +01:00
Laurent Destailleur
df9e121ac6 Enhance the module debugbar. Do not scan the log anymore. 2019-03-23 14:37:54 +01:00
markus
b0e12deb25 Fix travis 2019-03-20 09:36:23 +01:00
markus
8c010c2580 fix travis 2019-03-18 10:24:21 +01:00
Laurent Destailleur
bb8845ac41
Merge pull request #10865 from atm-maxime/new_box_birthdays 
NEW Widget birthdays of the month
 2019-03-18 08:56:58 +01:00
markus
b4807e7972 remove unneeded class 2019-03-17 18:38:26 +01:00
Maxime Kohlhaas
e090cd6f87 New box birthdays of the month 2019-03-17 16:55:26 +01:00
Laurent Destailleur
1abfd1f58e Add page to setup module debugbar 
Fix CSS
 2019-03-17 00:32:39 +01:00
Laurent Destailleur
95c1275efc Fix phpcs 2019-03-16 20:10:22 +01:00
Laurent Destailleur
c2badb57d7 NEW: Add module debugbar 2019-03-16 16:27:14 +01:00
markus
a45fbfae76 fix travis 2019-03-16 14:37:07 +01:00
Philippe GRAND
3d65b887a7 update with html5 compliant code 2019-03-14 14:34:33 +01:00
Philippe GRAND
719ecde6e9 update with html5 compliant code 2019-03-14 14:34:04 +01:00
Philippe GRAND
756bdfc6a8 update with html5 compliant code 2019-03-14 14:33:36 +01:00
Philippe GRAND
9ee27936f7 update with html5 compliant code 2019-03-14 14:33:00 +01:00
Philippe GRAND
ad9f75d3e9 update with html5 compliant code 2019-03-14 14:32:26 +01:00
Philippe GRAND
80858b39d9 update with html5 compliant code 2019-03-14 14:31:40 +01:00
Philippe GRAND
f71769e0e6 update with html5 compliant code 2019-03-14 14:31:08 +01:00
Philippe GRAND
f13d520830 update with html5 compliant code 2019-03-14 14:30:41 +01:00
Philippe GRAND
b4a9b3aa20 update with html5 compliant code 2019-03-14 14:30:08 +01:00
Philippe GRAND
5977cdad26 update with html5 compliant code 2019-03-14 14:29:16 +01:00
Philippe GRAND
6c4070eb87 update with html5 compliant code 2019-03-14 14:28:36 +01:00
Philippe GRAND
310670b3f6 update with html5 compliant code 2019-03-14 14:27:54 +01:00
Philippe GRAND
f082bd3e96 update with html5 compliant code 2019-03-14 14:27:16 +01:00
Philippe GRAND
af4edbba2b update with html5 compliant code 2019-03-14 14:26:43 +01:00
Philippe GRAND
d21dbe915b update with html5 compliant code 2019-03-14 14:26:08 +01:00
Philippe GRAND
6b878a2c64 update with html5 compliant code 2019-03-14 14:25:21 +01:00
Rafael Ingenleuf
f19574f27f changed UserBankAccount fetch 2019-03-12 11:57:50 +01:00
markus
e1f9e845cc remove empty line 2019-03-11 16:44:15 +01:00
markus
bdb03bd454 add class 2019-03-11 16:41:01 +01:00
markus
d7ca08afb0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-10 15:26:35 +01:00
markus
47fce826fe changes 2019-03-10 14:15:06 +01:00
markus
1737229eab update hints 2019-03-10 13:59:32 +01:00
markus
47f15897aa remove double line 2019-03-10 13:49:01 +01:00
markus
6a8d76ea39 honor MAIN_INVERT_SENDER_RECIPIENT 2019-03-10 13:44:50 +01:00
markus
6f05d6ea36 changes 2019-03-10 13:41:18 +01:00
markus
dcaed95bfe changes 2019-03-10 13:31:51 +01:00
markus
6ef6248d58 use fk_user_author 2019-03-10 13:27:22 +01:00
markus
b4c8977a44 next step 2019-03-10 13:22:21 +01:00
markus
b302f569a9 make public 2019-03-10 13:14:17 +01:00
markus
5b0ed63f6d use global $user 2019-03-10 13:11:43 +01:00
Frédéric FRANCE
b69f63e7d7
replace html by html5 2019-03-10 09:32:19 +01:00
markus
1ac54853d9 improve 2019-03-09 18:34:57 +01:00
markus
a789cfe576 fix typo 2019-03-09 18:32:44 +01:00
markus
b8ec0b20b0 #3700 New Switch EXPENSEREPORT_INVERT_SENDER_RECIPIENT 2019-03-09 18:22:37 +01:00
Laurent Destailleur
b710e28ffa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent.php
	htdocs/admin/barcode.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/admin.lang
 2019-03-09 01:20:13 +01:00
Laurent Destailleur
e38427a41f Fix var not initialized 2019-03-08 19:56:21 +01:00
markus
e452a2e31d add bank lib 2019-03-08 18:14:22 +01:00
markus
41c21b88c1 More output 2019-03-08 16:46:08 +01:00
markus
1bf99b81f1 Display more 2019-03-08 16:44:35 +01:00
Markus Welters
fac99ccd98
Merge pull request #2 from countiy/patch-1 
expensereport changed IBAN
 2019-03-08 16:37:04 +01:00
markus
c595dca5e7 fix typo 2019-03-08 16:35:11 +01:00
Rafael Ingenleuf
a505323fe7 expensereport changed IBAN 2019-03-08 16:27:08 +01:00
Rafael Ingenleuf
bcd3921561 expensereport layout changed and IBAN added 2019-03-08 15:36:09 +01:00
Laurent Destailleur
1a96a7a88f FIX More complete auto setup of barcode module 
Add tooltip help on member setup module
 2019-03-08 11:31:12 +01:00
Christophe Battarel
d414e3eb48 add product extrafields 2019-03-07 15:00:48 +01:00
Laurent Destailleur
daaa4ca0c2
Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed 
PSR2.Classes.PropertyDeclaration.VarUsed
 2019-03-07 12:49:13 +01:00
Christophe Battarel
a6bb1cf5f6 avoid timeout 2019-03-07 11:27:06 +01:00
Frédéric FRANCE
2745f98644
PSR2.Classes.PropertyDeclaration.VarUsed 2019-03-05 22:10:46 +01:00
Laurent Destailleur
cfd39a1483
Merge pull request #10742 from OPEN-DSI/fix-pdf-beluga-orientation 
Fix authorize long references in Beluga PDF model (uses Landscape mode)
 2019-03-05 18:45:02 +01:00
Laurent Destailleur
16e90ffae4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/langs/en_US/website.lang
 2019-03-05 15:59:42 +01:00
Laurent Destailleur
d18a5853df Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2019-03-05 15:57:31 +01:00
Laurent Destailleur
98f5bb2ed3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-05 15:55:08 +01:00
Laurent Destailleur
b851911708 Dolibarize module ticket 2019-03-05 12:18:46 +01:00
Lionel VESSILLER
ef10a32069 Fix authorize long references in Beluga PDF model (uses Landscape mode) 2019-03-05 11:18:44 +01:00
Laurent Destailleur
4a582485b9 Debug module ticket 2019-03-04 19:19:09 +01:00
Laurent Destailleur
0d49f27831 Code style 2019-03-04 17:36:45 +01:00
Laurent Destailleur
68bb95079a Ignore 2 rules 2019-03-04 17:36:03 +01:00
Laurent Destailleur
69794f5293 Fix phpcs 2019-03-04 17:31:50 +01:00
Laurent Destailleur
d8259f94e1 Work on BOM module 2019-03-04 13:40:16 +01:00
Laurent Destailleur
925def5390 Work on BOM module 2019-03-04 13:37:00 +01:00
Laurent Destailleur
7b7ff33fdf Work on BOM module 2019-03-04 13:30:43 +01:00
Laurent Destailleur
1c775b7b68 Work of BOM module 2019-03-04 12:46:07 +01:00
Laurent Destailleur
481d0de010 FIX Import of service was not available in update mode 2019-03-03 13:02:20 +01:00
Frédéric FRANCE
3037e4a157
Update DolibarrModules.class.php 2019-03-02 20:49:53 +01:00
Laurent Destailleur
8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
 2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/modAgenda.class.php
 2019-03-02 19:07:14 +01:00
Laurent Destailleur
8f8aaf1e8c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-02 19:05:51 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
5f6ca1119a Replace arrow picto with fontawesome 2019-03-02 14:07:13 +01:00
Frédéric FRANCE
014f69850e
add visibility 2019-03-01 23:08:57 +01:00
Frédéric FRANCE
c5c27fdb77
add visibility 2019-03-01 19:24:06 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility 2019-03-01 18:28:51 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility 2019-02-28 23:19:58 +01:00
Frédéric FRANCE
0022c4fe72
add visibility 2019-02-28 22:44:12 +01:00
Frédéric FRANCE
7e31ca48d8
add visibility 2019-02-28 22:07:48 +01:00
Frédéric FRANCE
4f9e35f350
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-28 20:48:23 +01:00
Frédéric FRANCE
92c5c15033
add visibility 2019-02-28 20:48:07 +01:00
Marc de Lima Lucio
b96ac794e9 FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work 2019-02-28 16:15:32 +01:00
Laurent Destailleur
cefaeb583f
Update xinputfile.modules.php 2019-02-28 11:24:43 +01:00
Laurent Destailleur
85d46a5270
Update xinputfile.modules.php 2019-02-28 11:24:07 +01:00
Laurent Destailleur
b8b55fb748 WIP Add IFTTT module 2019-02-28 10:30:27 +01:00
gauthier
1237a6d3e9 FIX : same thing here 2019-02-27 14:58:10 +01:00
gauthier
49e03b009f FIX : if empty error message, we just see "error" displayed 2019-02-27 14:50:01 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
Laurent Destailleur
58e2901d14 Fix phpcs 2019-02-27 00:54:07 +01:00
Frédéric FRANCE
8b4e920d5e
add visibility 2019-02-26 22:42:19 +01:00
Frédéric FRANCE
5016bc7188
wip 2019-02-26 21:48:21 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Frédéric FRANCE
e6c3eb0ba1
wip 2019-02-26 21:13:07 +01:00
Laurent Destailleur
9e82c37963 WIP Start module BOM 2019-02-26 19:27:04 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
Frédéric FRANCE
675a17a74c
wip 2019-02-26 00:34:43 +01:00
Frédéric FRANCE
346d1f410c
wip 2019-02-25 23:15:48 +01:00
Frédéric FRANCE
915841eeb9
wip 2019-02-25 22:50:19 +01:00
Frédéric FRANCE
c89e4d79b8
wip 2019-02-25 22:27:04 +01:00
Frédéric FRANCE
1c07006015
wip 2019-02-25 21:36:27 +01:00
Cristian Torres
c781eeb17d [FIX] ORDER BY before custom filters for where 
When filtering data "and cac.libelle" would be appended after ORDER BY
 2019-02-24 20:55:27 +01:00
Laurent Destailleur
dfd6a0feaa
Merge pull request #10643 from tony13tv/patch-3 
[FIX] ORDER BY before custom filters for where
 2019-02-24 20:55:01 +01:00
Laurent Destailleur
89087473e1
Merge pull request #10674 from frederic34/patch-4 
Update printgcp.modules.php
 2019-02-24 20:44:08 +01:00
Frédéric FRANCE
e7706192b5
doc comment 2019-02-24 10:08:42 +01:00
Frédéric FRANCE
b51432790f
Update printgcp.modules.php 2019-02-24 09:39:48 +01:00
Frédéric FRANCE
485431a722
Update printgcp.modules.php 2019-02-24 09:31:19 +01:00
Laurent Destailleur
4da1bef6dc
Merge pull request #10654 from ptibogxiv/patch-125 
FIX Stripe live Oauth
 2019-02-23 14:21:25 +01:00
ptibogxiv
dd160a6242
Create stripelive_oauthcallback.php 2019-02-22 14:56:39 +01:00
Philippe GRAND
5a88930062 fix : The property total_vat does not exist on Reception 2019-02-21 14:38:12 +01:00
Cristian Torres
31aa3ec376
[FIX] ORDER BY before custom filters for where 
When filtering data "and cac.libelle" would be appended after ORDER BY
 2019-02-20 11:45:07 -06:00
Regis Houssin
1c3541295b FIX wrong class name "CUnits instead CMeasuringUnits" 2019-02-19 09:24:30 +01:00
Laurent Destailleur
ebfb6beee3 Merge 2019-02-18 19:14:42 +01:00
Laurent Destailleur
e6e18ff616 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/product/stock/card.php
	htdocs/product/stock/info.php
	htdocs/product/stock/movement_list.php
 2019-02-14 15:33:17 +01:00
Laurent Destailleur
89050da856 Merge 2019-02-14 15:27:31 +01:00
Laurent Destailleur
afc612c2cb
Merge pull request #10592 from frederic34/patch-30 
Update mod_expensereport_sand.php
 2019-02-14 13:32:00 +01:00
Laurent Destailleur
418bab3214
Merge pull request #10591 from frederic34/patch-29 
Update mod_payment_ant.php
 2019-02-14 13:31:51 +01:00
Laurent Destailleur
a655481adb
Merge pull request #10590 from frederic34/patch-28 
Update mod_ticket_universal.php
 2019-02-14 13:31:33 +01:00
Laurent Destailleur
cd9bd26267
Merge pull request #10589 from frederic34/patch-27 
Update mod_facture_mercure.php
 2019-02-14 13:31:15 +01:00
Laurent Destailleur
b69a416960
Merge pull request #10588 from frederic34/patch-24 
Update mod_commande_fournisseur_orchidee.php
 2019-02-14 13:29:15 +01:00
Laurent Destailleur
7e4a4c2ae6
Merge pull request #10587 from frederic34/patch-23 
Update mod_holiday_immaculate.php
 2019-02-14 13:28:56 +01:00
Laurent Destailleur
c45ed24342
Merge pull request #10586 from frederic34/patch-22 
Update modules_holiday.php
 2019-02-14 13:28:30 +01:00
Laurent Destailleur
3050366372 Fix table of units already exists. Merge duplicate c_measuring_units 
with c_units.
 2019-02-14 13:02:44 +01:00
Regis Houssin
359318392f FIX missing entity filter in function "build_filterField()" (export) 2019-02-14 10:47:07 +01:00
Frédéric FRANCE
6276845956
Update mod_expensereport_sand.php 2019-02-13 23:48:44 +01:00
Frédéric FRANCE
1e52ef19a5
Update mod_payment_ant.php 2019-02-13 23:45:28 +01:00
Frédéric FRANCE
423a69ffad
Update mod_ticket_universal.php 2019-02-13 23:44:06 +01:00
Frédéric FRANCE
210fb2eac1
Update mod_facture_mercure.php 2019-02-13 23:41:47 +01:00
Frédéric FRANCE
5c50ea8afe
Update mod_commande_fournisseur_orchidee.php 
The property db does not exist on mod_commande_fournisseur_orchidee
 2019-02-13 23:39:02 +01:00
Frédéric FRANCE
9370c8b3f6
Update mod_holiday_immaculate.php 2019-02-13 23:36:16 +01:00
Frédéric FRANCE
e0843e6130
Update modules_holiday.php 2019-02-13 23:35:44 +01:00
Laurent Destailleur
a689f8dc3f Code comment 2019-02-13 23:34:28 +01:00
florian HENRY
d88475c61a Merge branch 'develop' of local repository into dev_importproduct_measuringunit 2019-02-13 08:59:18 +01:00
Laurent Destailleur
0d8447ad39 Merge branch 'develop' of https://github.com/wdammak/dolibarr into 
wdammak-develop

# Conflicts:
#	htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
 2019-02-12 16:58:55 +01:00
florian HENRY
5b5f96bafb NEW : measuring unit dictionnary and product size/unit import 2019-02-12 16:58:11 +01:00
Laurent Destailleur
205152501e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/public/payment/newpayment.php
 2019-02-12 13:39:39 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
b1088f556f
Merge pull request #10536 from grandoc/new_branch_09_02_2019 
language internationalization
 2019-02-12 13:28:56 +01:00
Laurent Destailleur
a62bccaf24 Fix phpcs 2019-02-11 19:19:05 +01:00
Laurent Destailleur
f0e56abac7 NEW Module ticket is available as a stable module 2019-02-11 19:16:37 +01:00
Laurent Destailleur
c095f802dd Dolibarrize module ticket 2019-02-11 14:51:59 +01:00
Frédéric FRANCE
152d8ffcbf
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Philippe Grand
92ec149fb6
Update modules_fichinter.php 2019-02-09 11:05:52 +01:00
Philippe GRAND
869f59de96 language internationalization 2019-02-09 10:56:59 +01:00
Laurent Destailleur
7625eb7cd4 Fix missing error management after afterPDFCreation hook. 
Removed dead code
 2019-02-08 19:54:24 +01:00
Laurent Destailleur
a916708068 Fix missing disable dependency 2019-02-08 19:01:47 +01:00
Laurent Destailleur
ed733fb82d Fix phpcs 2019-02-08 13:28:10 +01:00
Laurent Destailleur
8760b1e592 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-08 12:57:50 +01:00
Laurent Destailleur
27da574e38 Fix phpcs 2019-02-08 12:36:33 +01:00
Laurent Destailleur
1611c613f5 Fix phpcs 2019-02-08 12:19:51 +01:00
Laurent Destailleur
ec686a8f79 Fix phpcs 2019-02-08 11:30:20 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
 2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-02-08 10:44:45 +01:00
Laurent Destailleur
af92303319
Merge pull request #10487 from frederic34/psr2squizwhite 
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
 2019-02-08 09:30:25 +01:00
Laurent Destailleur
6a4a92510d Code comment 2019-02-07 13:32:05 +01:00
atm-ph
8e6a567b09 Fix display payment table on multiple pages 2019-02-07 12:36:22 +01:00
Frédéric FRANCE
e1e14ae6e6
wip 2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/index.php
 2019-02-03 21:14:44 +01:00
Laurent Destailleur
4d41b1b33c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-03 19:45:45 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop 
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
 2019-02-03 19:11:07 +01:00
Laurent Destailleur
f8b10e9c3d Doxygen 2019-02-03 18:47:55 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found 2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2 2019-02-02 18:25:01 +01:00
Laurent Destailleur
75845a990f FIX Missing province in export of invoice 2019-02-01 22:55:28 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
6de732d7f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/facture/mod_facture_mars.php
	htdocs/core/modules/facture/mod_facture_terre.php
 2019-02-01 16:07:18 +01:00
Laurent Destailleur
35f65a571c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/facture/mod_facture_mars.php
	htdocs/core/modules/facture/mod_facture_terre.php
	htdocs/fourn/commande/list.php
 2019-02-01 16:05:43 +01:00
Laurent Destailleur
dee2a373c1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2019-02-01 16:01:18 +01:00
Laurent Destailleur
eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/members.lang
	htdocs/langs/fr_FR/members.lang
 2019-02-01 15:14:19 +01:00
Laurent Destailleur
4254ad0d33 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-31 15:51:54 +01:00
Laurent Destailleur
14dea53700 FIX Missing field in import/export of users 2019-01-31 15:51:02 +01:00
gauthier
09ba059c21 FIX : need an order by in case we found other invoice with same number but not same date 2019-01-31 11:03:06 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
97248a830b FIX #10440 2019-01-30 16:28:37 +01:00
Laurent Destailleur
6d992a6d7b FIX #10440 2019-01-30 16:24:27 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines 
PSR2.Files.EndFileNewline.TooMany
 2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Laurent Destailleur
c354656b1b
Merge pull request #10449 from ptibogxiv/patch-108 
NEW : list of stripe's payout
 2019-01-30 15:02:27 +01:00
Laurent Destailleur
60fa8d08c2
Merge pull request #10456 from aspangaro/10.0_Ledger_improve_import 
FIX: FEC Compatibility for import in ledger
 2019-01-30 15:01:02 +01:00
Alexandre SPANGARO
84ecfd96fb Update example 2019-01-30 11:22:01 +01:00
Alexandre SPANGARO
1b675ba0b6 FIX: FEC Compatibility for import in ledger 2019-01-30 09:51:29 +01:00
ptibogxiv
a3b648824a
ADD payout link 2019-01-29 14:12:35 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
77747ac2a3
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-28 16:35:12 +01:00
Frédéric FRANCE
764a928cd6
wip 2019-01-27 23:48:36 +01:00
Frédéric FRANCE
ff39491f15
wip 2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
46bc078481 Fix phpcs 2019-01-27 23:10:10 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
a268a13c89
Merge pull request #10423 from grandoc/new_branch_27_01_2019 
fix translations
 2019-01-27 17:55:05 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Philippe GRAND
b8ec33d29b fix translations 2019-01-27 17:28:18 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Philippe GRAND
95bbb46fdf fix translations 2019-01-27 12:20:24 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Philippe GRAND
a6c40dc867 fix translations 2019-01-27 11:37:57 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
51bdf5f949 Fix trans 2019-01-22 16:06:20 +01:00
Laurent Destailleur
d38ed67a3c
Merge pull request #10383 from grandoc/new_branch_21_01_2019 
update with html5 compliant code
 2019-01-21 18:05:40 +01:00
Laurent Destailleur
0cba7e1613 FIX Hide path into exported filename 2019-01-21 14:31:27 +01:00
Laurent Destailleur
0b199f4d28 FIX Hide path into exported filename 2019-01-21 14:31:03 +01:00
Laurent Destailleur
495b04a3c7 FIX Hide path into exported filename 2019-01-21 14:30:50 +01:00
Laurent Destailleur
d5e94c1689 Add phpmin of driver 2019-01-21 14:18:31 +01:00
Laurent Destailleur
5c2b9e3078 NEW Introduce PhpSpreadsheet for export (need php5.6+) 2019-01-21 14:06:01 +01:00
Laurent Destailleur
ecf46903ae Fix doxygen 2019-01-21 13:24:52 +01:00
Philippe GRAND
cdacfc5f37 update with html5 compliant code 2019-01-21 09:54:59 +01:00
Laurent Destailleur
f53232e2f9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-21 02:56:32 +01:00
Laurent Destailleur
7f8b710edc Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-21 02:52:24 +01:00
Laurent Destailleur
5ab6c41dfa Fix missing multicurrency fields in export 2019-01-21 02:43:08 +01:00
Laurent Destailleur
3ddfcbe3bb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	dev/setup/codesniffer/ruleset.xml
 2019-01-20 20:36:45 +01:00
Laurent Destailleur
616aa1f81c Fix var not defined 2019-01-19 17:10:14 +01:00
laurantines
7556ae4988
Update modFacture.class.php 
Correct double comma (,,)
 2019-01-17 11:58:25 +01:00
laurantines
fa598ad941
Update modFacture.class.php 
Add localtax1 and localtax2 fields in the export of customer invoices to be able to select them in step 2 of the export
 2019-01-17 11:31:32 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
Laurent Destailleur
724a2f32c3 Move module as experimental 2019-01-10 01:56:33 +01:00
Steve
70c0adc3d1 import.php 
HTML5 validation
ADDED htmlentities to enclosure and separator
CHANGED td aligns to css, removed nospan tag
ADDED clause to box generator to stop multiple duplicate ids when no $key
REMOVED height attribute
REMOVED nested b tag
CHANGED deprecated Center tag for div style center
FIX
Added check
if ($objimport->array_import_updatekeys[0] && count($objimport->array_import_updatekeys[0]
to stop php warning
------------------
modProduct.class.php
Products Import
ordered fields as per table structure order
ADDED and changed import fields and examples
------------------
modSociete.class.php
Third Party Import
Changed field orders to match table field order so future additions will be easier to manage.
REMOVED s.datec repeated in import example
ADDED: alias, payment mode, payment conditions, sales tax VAT, multicurrency, currency
Additional Address Import
Changed field orders to match table field order
import example csv was missing birthday
Bank Account Import
Changed field orders to match table field order
ADDED label (required for a bank account
ADDED datec (required for d.debit UMR)
ADDED to address import: s.fk_departement
modified text to import example csv
-------------------
companies.lang
various new constants for import file column headers
 2018-12-20 16:49:17 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
 2018-12-18 21:55:14 +01:00
Laurent Destailleur
4b7f373802 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-18 21:37:34 +01:00
Laurent Destailleur
fb8c3f01a4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/modules/project/doc/pdf_baleine.modules.php
	htdocs/core/modules/project/doc/pdf_beluga.modules.php
 2018-12-18 21:35:30 +01:00
Laurent Destailleur
6851232314 Fix removing constant no more required 2018-12-18 21:29:36 +01:00
Laurent Destailleur
2e6a41228f Fix removing constant no more required 2018-12-18 20:49:48 +01:00
Laurent Destailleur
65412b77de Default nb of digits for customer code "monkey" template is on 5 digits. 2018-12-18 20:16:02 +01:00
Laurent Destailleur
6e0df5d3cc Default nb of digits for customer code "monkey" template is on 5 digits. 2018-12-18 20:14:36 +01:00
Laurent Destailleur
f1451904c0 Fix phpcs 2018-12-16 17:48:02 +01:00
Laurent Destailleur
9ce07b9582 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-12-16 15:36:18 +01:00
Laurent Destailleur
e366d7d57c Work on cash fence 2018-12-16 15:30:31 +01:00
Laurent Destailleur
988ba172ae Clean code of POS modules 2018-12-16 14:59:51 +01:00
Laurent Destailleur
85cd23caaf Fix phpcs 2018-12-15 18:31:36 +01:00
Laurent Destailleur
54ffba793f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
	htdocs/langs/en_US/admin.lang
 2018-12-15 18:21:37 +01:00
Laurent Destailleur
db46d82de3 Fix position of menu entries 2018-12-15 15:35:59 +01:00
Laurent Destailleur
2e1b762596 Fix phpcs 2018-12-15 15:07:35 +01:00
Laurent Destailleur
1bce3f6c6b Fix phpcs 2018-12-15 14:54:10 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
 2018-12-15 14:09:16 +01:00
Laurent Destailleur
6846d8821d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2018-12-15 14:07:25 +01:00
Laurent Destailleur
dbc85b42ba Fix phpcs 2018-12-15 13:58:39 +01:00
Laurent Destailleur
c6d76e29f1 Fix phpcs 2018-12-15 13:50:40 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
1971482c24
Merge pull request #10180 from fappels/payments_pdf_expensereport 
NEW add payments table to pdf of expense report
 2018-12-14 17:46:48 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer 
fix scrunitizer
 2018-12-14 17:28:34 +01:00
Laurent Destailleur
b95fa8ad3e
Merge pull request #10038 from aspangaro/10.0_members 
NEW Add gender in member card
 2018-12-14 16:24:00 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members 2018-12-14 11:39:02 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Lionel VESSILLER
1512ba9242 Add contact status in category export 2018-12-12 14:20:04 +01:00
Laurent Destailleur
85af3ad513 NEW Unsubscribed emails are now stored in dedicated table 2018-12-11 10:24:57 +01:00
Laurent Destailleur
5ec9a1ca7f Remove deprecated parameter 2018-12-11 10:15:13 +01:00
Laurent Destailleur
21b3bbc2e6 Merge 2018-12-08 11:55:27 +01:00
Laurent Destailleur
a915d82883 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-08 11:42:30 +01:00
Maxime Kohlhaas
550df138a6 Fix unexistant fields 2018-12-07 12:19:50 +01:00
fappels
6d27a6458e Fix travis 2018-12-05 11:10:42 +01:00
fappels
d1d41f4dd4 New add payments table to pdf expense report 2018-12-04 23:16:41 +01:00
Laurent Destailleur
f142238817 Fix missing field canvas 2018-12-04 21:25:59 +01:00
Philippe GRAND
e9e6d8b9b5 Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato> 2018-12-04 16:10:56 +01:00
Philippe GRAND
c113a7ca3b Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato> 2018-12-04 14:04:02 +01:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
8fea6338e1 Fix #6565 
Fix pdf footer height for all documents
 2018-12-02 18:51:49 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Laurent Destailleur
6f3d2e98a2
Merge pull request #10150 from frederic34/patch-9 
add log in empty catch
 2018-12-01 23:04:41 +01:00
Frédéric FRANCE
471ea35d6c
add log in empty catch 2018-12-01 22:26:45 +01:00
Frédéric FRANCE
c6291b3e08
Update pdf_strato.modules.php 2018-12-01 21:59:37 +01:00
Frédéric FRANCE
912f7c6c68
Update pdf_strato.modules.php 2018-12-01 21:41:40 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
13806124b2 Fix add missing fk_department and fk_pays in contact/bank imports 2018-12-01 17:11:04 +01:00
Frédéric FRANCE
9ceea06468
fix travis 2018-12-01 17:10:06 +01:00
florian HENRY
589511f38c fix #9999 2018-12-01 16:23:40 +01:00
florian HENRY
b9046b9174 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:42:07 +01:00
Laurent Destailleur
778547818d
Merge pull request #10108 from frederic34/patch-2 
Avoid adding libs not compatible with php 5.4
 2018-12-01 15:09:25 +01:00
Laurent Destailleur
30ed180dd4
Merge pull request #10122 from defrance/patch-129 
scrutinizer major error correction
 2018-12-01 14:29:42 +01:00
BENKE Charlene
676ac67817
scrutinizer error update 2018-12-01 11:49:25 +01:00
BENKE Charlene
1f91a763ff
scrutinizer major error correction 
It seems like $tasksarray can also be of type string. However, the property $lines is declared as type array<integer,object<Task>>. Maybe add an additional type check?
 2018-12-01 11:44:46 +01:00
Frédéric FRANCE
07da468109
Update modDav.class.php 2018-12-01 11:39:58 +01:00
Juanjo Menent
6104d16b08
Merge pull request #10117 from atm-maxime/fix_pdf_contract 
Fix pdf strato for contract with multipage
 2018-12-01 11:14:38 +01:00
Maxime Kohlhaas
2b5bf0e2dd Fix pdf strato for contract with multipage 2018-12-01 01:07:15 +01:00
Maxime Kohlhaas
5dcb3d2a1f Fix extrafields in import tool 2018-11-30 19:23:05 +01:00
Laurent Destailleur
4260d5765f Fix bad trans key 2018-11-30 11:50:32 +01:00
Laurent Destailleur
6fbf292a95 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-11-30 11:01:36 +01:00
Laurent Destailleur
dd357d167a Update ChangeLog 2018-11-30 11:00:42 +01:00
Laurent Destailleur
bbfd134733 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:24:18 +01:00
Laurent Destailleur
ea3e58a390
Merge pull request #10090 from hregis/8.0_bug3 
FIX remove constant for avoid problem
 2018-11-29 11:18:29 +01:00
Laurent Destailleur
9e20d9e847 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:03:16 +01:00
Laurent Destailleur
10fc0149d8 responsive 2018-11-29 11:03:02 +01:00
Regis Houssin
b4aa9ee335 FIX remove constant for avoid problem 2018-11-28 17:04:42 +01:00
Philippe GRAND
9bf0f12068 fix typo error 2018-11-26 14:32:04 +01:00
Laurent Destailleur
2e139d1960 Fix var $hidedetails not defined 2018-11-25 12:08:49 +01:00
Frédéric FRANCE
491270b27f
try to fix the expensereport pdf 2018-11-21 23:06:52 +01:00
Laurent Destailleur
07fe7e58d8 Code comment 2018-11-20 19:04:58 +01:00
Laurent Destailleur
4b82538941 Better module position 2018-11-20 14:56:14 +01:00
Laurent Destailleur
471f41577c
Merge pull request #10040 from defrance/patch-124 
Add societe extrafields on proposal export
 2018-11-19 18:33:41 +01:00
Laurent Destailleur
ade0363224 Module status 2018-11-19 15:46:20 +01:00
BENKE Charlene
92562ad89f
Add societe extrafields on export 2018-11-19 12:17:41 +01:00
Laurent Destailleur
824b1924e2 Fix loading of cronjob 2018-11-19 10:33:42 +01:00
Alexandre SPANGARO
2d55666a0b NEW Add gender in member card 2018-11-18 21:50:58 +01:00
Regis Houssin
7cba680f38 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-18 17:07:03 +01:00
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +01:00
atm-quentin
56d4a8a737 revert some code 2018-11-16 15:16:48 +01:00
atm-quentin
7571760fdd fix errors during cherry picking 2018-11-16 11:31:23 +01:00
atm-quentin
70fdff5c27 revert getNextValue function + createfromclone entity 2018-11-16 11:23:14 +01:00
atm-quentin
c18f486179 set facture to invoice AND check invoicenumber conf 2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62 remplacement en masse des $conf->entity par des getEntity('facture') 2018-11-16 11:17:18 +01:00
atm-quentin
8e51204dff manage invoice with multicompany 2018-11-16 11:14:33 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Laurent Destailleur
e1407c8289
Merge pull request #10012 from hregis/develop_mc 
FIX compatibility between proposal sharing and proposalnumber sharing
 2018-11-15 17:19:28 +01:00
Laurent Destailleur
85cdc44105 Several fixes in project creation, cache of dolGetIfFromCode, ... 2018-11-15 13:39:12 +01:00
Regis Houssin
0907a6d611 FIX wrong object name (travis error) 2018-11-14 16:55:14 +01:00
Regis Houssin
874e27ef84 FIX multicompany override constants of current entity 2018-11-14 15:37:10 +01:00
Regis Houssin
93a1e941a4 FIX new method: override constants of current entity 2018-11-14 15:34:39 +01:00
Regis Houssin
9ff4b31843 FIX compatibility with invoice sharing and invoice number sharing 2018-11-14 15:24:22 +01:00
Regis Houssin
04edcaa89c FIX compatibility between proposal sharing and proposalnumber sharing 2018-11-13 20:20:46 +01:00
Laurent Destailleur
628918f863 Remove var_dump 2018-11-12 16:43:33 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
e86e3ec7ac Work on email collector 2018-11-09 19:30:44 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
9d15f83f4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-08 20:19:45 +01:00
Laurent Destailleur
3e844db74f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/stats/index.php
 2018-11-08 20:19:28 +01:00
Laurent BOUQUET
320e7adef7 Fix blank lines and whitespace at end of lines 2018-11-08 17:09:54 +01:00
Laurent BOUQUET
b03a91213f Merge branch 'develop' into feature/product-search-barcode 2018-11-08 16:57:49 +01:00
Laurent Destailleur
5bbf7e8f1d Fix look and feel v8 2018-11-08 10:21:43 +01:00
Laurent Destailleur
6ba78b2bb3 Work on email collector 2018-11-07 16:33:06 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
c1cf4fbb95 Fix phpcs 2018-11-06 20:29:58 +01:00
Laurent Destailleur
e0070bd348 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2018-11-06 18:30:57 +01:00
Regis Houssin
d32fd9fda5 FIX export only prices of the current entity ! 2018-11-06 18:08:29 +01:00
Laurent Bouquet
f05b67909b NEW : Add product search from barcode via REST api 2018-11-06 12:13:16 +01:00
Laurent Destailleur
055a55b900 NEW Add SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME and 
SHIPPING_PDF_HIDE_QTYTOSHIP
 2018-11-06 10:03:12 +01:00
Laurent Destailleur
52aa860008 Code comment 2018-11-06 09:39:22 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
52d4426e87 Debug new modules 2018-11-05 16:38:07 +01:00
Laurent Destailleur
90729c03c4 Fix dependencies of new modules 2018-11-05 10:28:44 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
7e55701774 2 remind of subscription expired by default 2018-11-03 11:41:45 +01:00
Laurent Destailleur
64b5e432c2 2 remind of expired subscription by default 2018-11-03 11:40:43 +01:00
Laurent Destailleur
0229b96178 Fix family of module 2018-11-03 11:38:29 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
4b402aa6d1 Fix regression on name of array 2018-10-31 15:41:00 +01:00
Laurent Destailleur
be8e48b265 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
	htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
	htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
 2018-10-31 15:38:29 +01:00
Laurent Destailleur
07719eaf1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-31 15:31:44 +01:00
Laurent Destailleur
ca726e6c94 FIX Error generating ODT when option to use contact on doc on 2018-10-31 15:31:22 +01:00
Laurent Destailleur
0ca5da055f Debug v9 2018-10-31 15:04:01 +01:00
Laurent Destailleur
693570c48b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2018-10-31 11:50:29 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
2c3cd7a668 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSyslog.class.php
 2018-10-30 15:32:09 +01:00
Laurent Destailleur
b9078c6d58 Fix phpcs 2018-10-30 15:30:04 +01:00
Laurent Destailleur
68804cf8a5
Merge pull request #9890 from atm-maxime/fix_import_societe_alias 
FIX missing name alias field in societe import/export #9091
 2018-10-30 15:00:34 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-10-30 14:47:39 +01:00
Laurent Destailleur
afe61579e8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 14:29:26 +01:00
Laurent Destailleur
b0ef8680ff Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-30 14:28:25 +01:00
Laurent Destailleur
d309f22e55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 13:54:25 +01:00
Laurent Destailleur
d4fd55c4cf FIX #9907 2018-10-30 13:54:11 +01:00
Laurent Destailleur
2ced09e8ab
Merge pull request #9888 from aljawaid/patch-3 
FIX: Expense Report Ref Not Showing in PDF File Properties
 2018-10-30 12:20:12 +01:00
Laurent Destailleur
5935a420a8
Merge pull request #9886 from frederic34/catchblockempty 
fill empty catch with log
 2018-10-30 12:16:41 +01:00
Laurent Destailleur
0500f54237 Email collector 2018-10-29 11:29:08 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Maxime Kohlhaas
abb343d37e Fix missing name alias field in societe import/export #9091 2018-10-27 09:42:08 +02:00
IJ
71c64c0944
FIX: Expense Report Ref Not Showing in PDF File Properties 
The generated pdf title field in the pdf file document properties was blank.  This fixes that.
 2018-10-27 01:57:07 +01:00
Frédéric FRANCE
b80d2fa12d
fill empty catch with log 2018-10-26 21:09:46 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
8b601bd7fd Fix numbering of holidays 2018-10-25 18:50:53 +02:00
Marc de Lima Lucio
16c35035c1 FIX: pdf typhon: order reference duplicate 2018-10-25 12:07:40 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
6edaf3a422
Merge branch 'develop' into patch-9 2018-10-24 12:24:00 +02:00
Laurent Destailleur
c2c4366c62 Removed duplicate translation 2018-10-24 11:38:16 +02:00
Laurent Destailleur
aa0bcc6878 Fix phpcs 2018-10-24 11:15:14 +02:00
Frédéric FRANCE
2bc208675f
Update pdf_cyan.modules.php 2018-10-24 09:06:54 +02:00
Frédéric FRANCE
d9d346aab2
Update pdf_sponge.modules.php 2018-10-24 08:22:17 +02:00
Frédéric FRANCE
4747e93e39
Update pdf_eratosthene.modules.php 2018-10-24 08:18:21 +02:00
Laurent Destailleur
0f48cc1d0f
Merge branch 'develop' into fixpdf 2018-10-24 03:01:52 +02:00
Laurent Destailleur
f10cb76597 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 02:00:56 +02:00
Laurent Destailleur
ae44c4c7f5 Disable duplicate feature with emailing module and field "unsubscribe 
requested"
 2018-10-24 02:00:43 +02:00
John BOTELLA
d9965d1986 Fix travis messages 2018-10-23 17:18:30 +02:00
atm-quentin
52236d1f0c set to development module 2018-10-23 15:58:38 +02:00
atm-quentin
96d0bb8f2e FIX adapt develop 2018-10-23 14:31:58 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
Frédéric FRANCE
570ee200d8
Merge remote-tracking branch 'upstream/develop' into fixpdf 2018-10-22 20:19:28 +02:00
Laurent Destailleur
f65df9e541 NEW Add option PDF_DISABLE_MYCOMPANY_LOGO to disable logo on PDF 2018-10-22 20:06:03 +02:00
atm-quentin
7684d7bddd FIX export comment better than desc of order line 2018-10-22 15:51:47 +02:00
Frédéric FRANCE
042118fe38
fix it 2018-10-19 18:35:16 +02:00
Frédéric FRANCE
c811d5a371
fix new pdf 2018-10-19 18:20:06 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files 
Experimental new pdf documents  using new column system
 2018-10-19 15:51:54 +02:00
Frédéric FRANCE
6c85fbbc30
add log and comment 2018-10-18 21:47:10 +02:00
atm-quentin
ba997a0d0f FIX for mask 2018-10-18 14:48:20 +02:00
atm-quentin
8ef7c29d19 FIX PDF Total Ordered 2018-10-17 17:17:11 +02:00
atm-quentin
dd0a57d39e FIX pdf for creating invoice without massaction 2018-10-17 15:36:47 +02:00
Laurent Destailleur
550a66d338
Merge pull request #9772 from ptibogxiv/patch-76 
NEW move ticket dictionary in API /setup
 2018-10-16 21:39:30 +02:00
atm-quentin
354825d006 NEW modele pdf canelle_reception to display linked reception to line 2018-10-16 14:58:56 +02:00
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
atm-quentin
83c8a78628 NEW auto event msg 2018-10-15 17:08:28 +02:00
Laurent Destailleur
6d4d8a0342 Dolibarize data privacy policy module 2018-10-15 14:05:54 +02:00
Maxime Kohlhaas
c66823d72f Fix numbering of supplier credit notes (issue #9624) 2018-10-14 17:07:38 +02:00
Philippe GRAND
effd11e1f9 translation 2018-10-13 12:42:01 +02:00
Philippe GRAND
94ea438881 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-13 12:40:28 +02:00
Laurent Destailleur
e5cc4ae61b Code comment 2018-10-13 12:00:59 +02:00
Philippe GRAND
30630ff368 fix typo 2018-10-13 11:58:19 +02:00
atm-quentin
83e4d6bd13 NEW export reception 2018-10-11 15:28:28 +02:00
atm-quentin
7ad4a7e384 NEW creation facture fourn depuis reception 2018-10-09 16:26:40 +02:00
Laurent Destailleur
5d2f34dc1e
Merge pull request #9715 from inoveaconseil/datapolicies 
Dolibarization DataPolicies
 2018-10-09 16:03:14 +02:00
Inovea Conseil
768ab66d1f Datapolicies 2018-10-09 14:40:15 +02:00
atm-quentin
9f56540e75 NEW actions buttons done with stock movement 2018-10-09 11:33:41 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
atm-quentin
c6ab79bad3 NEW note, contact and lines on card 2018-10-08 16:54:33 +02:00
Laurent Destailleur
a0ba01321b Fix phpcs 2018-10-06 12:50:32 +02:00
Philippe GRAND
61daff6cb6 Standardize code 2018-10-06 12:34:51 +02:00
Laurent Destailleur
e24117e75b Fix position of modules is string on 2 digits 2018-10-06 11:57:53 +02:00
Laurent Destailleur
d1dde0ffac Include rgpd module with name DataPolicies 2018-10-06 02:51:47 +02:00
Laurent Destailleur
fd859d3162 Add a component to select lang into a web site 2018-10-03 18:40:54 +02:00
atm-quentin
41d8cb87a3 debut reception setup page 2018-10-03 12:22:41 +02:00
Laurent Destailleur
771922f427 Use 2 distinct left menu entries for leads and projects 2018-10-01 18:56:47 +02:00
Laurent Destailleur
1dfbb22bf8
Merge branch 'develop' into new_branch_13_09_2018 2018-10-01 02:20:16 +02:00
Frédéric FRANCE
c8ddf18558
Update mod_codeclient_monkey.php 2018-09-30 23:02:52 +02:00
Laurent Destailleur
aaa5efc77e Clean Take pos module 2018-09-28 22:06:04 +02:00
Laurent Destailleur
492b9c1a03 Fix phpcs 2018-09-28 18:03:53 +02:00
Laurent Destailleur
47da95fbbf Fix dependency of module 2018-09-28 13:50:37 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00
Laurent Destailleur
a88dcfd1e4 Fix phpcs 2018-09-28 02:24:11 +02:00
Laurent Destailleur
60c74a6255
Merge pull request #9582 from grandoc/new_branch_21_09_2018 
Standardize and update code from New branch 21 09 2018
 2018-09-27 10:07:15 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price 
NEW Advanced permission to ignore price min
 2018-09-27 09:57:49 +02:00
Philippe Grand
031b3b44c5
Merge branch 'develop' into new_branch_13_09_2018 2018-09-27 09:42:58 +02:00
Philippe Grand
b7304e3d82
Merge branch 'develop' into new_branch_21_09_2018 2018-09-27 09:29:26 +02:00
Philippe GRAND
2799bd175d Translated comment 2018-09-23 21:35:43 +02:00
Laurent Destailleur
e277670a70
Merge pull request #9573 from grandoc/new_branch_20_09_2018 
Standardize and update code from New branch 20 09 2018
 2018-09-23 15:35:42 +02:00
Philippe GRAND
3464afe391 Update comment 2018-09-21 15:12:17 +02:00
Philippe Grand
870f504633
Update doc_generic_usergroup_odt.modules.php 2018-09-21 14:34:30 +02:00
Philippe Grand
0bcec6c923
Update doc_generic_user_odt.modules.php 2018-09-21 14:33:48 +02:00
Philippe Grand
2afaccf099
Update mod_ticket_universal.php 2018-09-21 14:32:31 +02:00
Philippe GRAND
9fab0a1d45 Update comments 2018-09-21 14:16:22 +02:00
Philippe GRAND
de6fca0844 fix merging 2018-09-21 14:09:12 +02:00
Philippe GRAND
48c3a1e1bc fix merging 2018-09-21 14:06:55 +02:00
Philippe Grand
d5003c9d3c
Merge branch 'develop' into new_branch_21_09_2018 2018-09-21 13:55:04 +02:00
Laurent Destailleur
7ece28ffd3 Trans 2018-09-21 11:48:01 +02:00
Frédéric FRANCE
7434b076d8
correct link to setup modulebuilder 2018-09-21 11:12:19 +02:00
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018 2018-09-21 10:12:48 +02:00
Laurent Destailleur
8cfe5d7252
Merge pull request #9569 from grandoc/new_branch_19_09_2018 
Missing translation
 2018-09-21 09:50:18 +02:00
Laurent Destailleur
f7392871dd
Merge pull request #9579 from frederic34/patch-9 
remove warning Line exceeds 500 characters
 2018-09-21 09:40:28 +02:00
Philippe GRAND
bde8d8ae0e Comment and typo 2018-09-21 09:32:50 +02:00
Philippe GRAND
f59ac8dda5 Merge remote-tracking branch 'origin/new_branch_20_09_2018' into new_branch_21_09_2018 2018-09-21 09:07:17 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
 2018-09-20 23:43:34 +02:00
Frédéric FRANCE
042555e716
remove warning Line exceeds 500 characters 2018-09-20 20:44:17 +02:00
Laurent Destailleur
4ba057528f Fix permissionss 2018-09-20 19:37:28 +02:00
Laurent Destailleur
36b8958c59 Move Stripe menu transactions and charges from develop to experimental 2018-09-20 19:35:13 +02:00
Philippe GRAND
e1a03c49cf Standardize and update code 2018-09-20 17:19:42 +02:00
Philippe GRAND
85ff212498 Standardize and update code 2018-09-20 17:11:29 +02:00
Philippe GRAND
e64fbd9522 Standardize and update code 2018-09-20 17:02:32 +02:00
Philippe GRAND
8225e039d9 Standardize and update code 2018-09-20 16:58:34 +02:00
Philippe GRAND
2adfdab771 Standardize and update code 2018-09-20 15:14:59 +02:00
Philippe GRAND
92a484dcd9 Standardize and update code 2018-09-20 15:07:43 +02:00
Philippe GRAND
7eda9c846c Standardize and update code 2018-09-20 15:01:03 +02:00
Philippe GRAND
b7a4311802 Standardize and update code 2018-09-20 14:56:40 +02:00
Philippe GRAND
b1fa12e1e3 Standardize and update code 2018-09-20 14:51:09 +02:00
Philippe GRAND
49fe6d3b79 Standardize and update code 2018-09-20 14:43:54 +02:00
Philippe GRAND
7c92157636 Standardize and update code 2018-09-20 14:25:53 +02:00
Philippe GRAND
7903a64c36 Standardize and update code 2018-09-20 14:23:09 +02:00
Philippe GRAND
11f254cd14 Standardize and update code 2018-09-20 14:19:52 +02:00
Philippe GRAND
cf8e12ced2 Standardize and update code 2018-09-20 14:15:39 +02:00
Philippe GRAND
12b56d17ba Standardize and update code 2018-09-20 14:11:59 +02:00
Philippe GRAND
0b4a0ac667 Standardize and update code 2018-09-20 14:09:25 +02:00
Philippe GRAND
4bd0af7a88 Standardize and update code 2018-09-20 14:05:57 +02:00
Philippe GRAND
bb0a830b78 Standardize and update code 2018-09-20 13:56:18 +02:00
Philippe GRAND
c0dc4f3a48 Standardize and update code 2018-09-20 13:52:57 +02:00
Philippe GRAND
7b50935e49 Standardize and update code 2018-09-20 13:44:45 +02:00
Philippe GRAND
a14c520910 Standardize and update code 2018-09-20 13:41:26 +02:00
Philippe GRAND
88bf2dee64 Standardize and update code 2018-09-20 13:36:00 +02:00
Philippe GRAND
7ffcc2e63f Standardize and update code 2018-09-20 13:32:41 +02:00
Philippe GRAND
cbda62b1ca Standardize and update code 2018-09-20 12:30:38 +02:00
Philippe GRAND
803505b6b7 Standardize and update code 2018-09-20 12:27:06 +02:00
Philippe GRAND
d091f5e16f Standardize and update code 2018-09-20 12:21:49 +02:00
Philippe GRAND
50073fe98d Standardize and update code 2018-09-20 12:16:31 +02:00
Philippe GRAND
bd87b1381d Standardize and update code 2018-09-20 12:14:30 +02:00
Philippe GRAND
d2d40ef0a3 Standardize and update code 2018-09-20 12:12:37 +02:00
Philippe GRAND
4b51227ca9 Standardize and update code 2018-09-20 12:10:13 +02:00
Philippe GRAND
5979db7733 Standardize and update code 2018-09-20 12:07:23 +02:00
Philippe GRAND
32beccc3be Standardize and update code 2018-09-20 12:02:23 +02:00
Philippe GRAND
67147582af Standardize and update code 2018-09-20 12:00:10 +02:00
Philippe GRAND
d5a3411fbc Standardize and update code 2018-09-20 11:28:54 +02:00
Philippe GRAND
08325d40ce Standardize and update code 2018-09-20 11:18:02 +02:00
Philippe GRAND
0222ea7e8c Standardize and update code 2018-09-20 09:19:17 +02:00
Philippe GRAND
1adc4bad9e Standardize and update code 2018-09-20 09:17:25 +02:00
Philippe GRAND
46d7385c54 Standardize and update code 2018-09-20 09:13:49 +02:00
Philippe GRAND
9b3dba4a56 Standardize and update code 2018-09-20 09:04:30 +02:00
Philippe GRAND
06ad6e7196 Standardize and update code 2018-09-20 09:04:12 +02:00
Philippe GRAND
9a487169c8 Standardize and update code 2018-09-20 09:03:52 +02:00
Philippe GRAND
ad84340bf5 Standardize and update code 2018-09-20 09:03:26 +02:00
Philippe GRAND
52533a0210 Standardize and update code 2018-09-19 16:43:37 +02:00
Philippe GRAND
bd3ba04e24 Standardize and update code 2018-09-19 16:36:08 +02:00
Philippe GRAND
57fc8cf06f Standardize and update code 2018-09-19 16:31:36 +02:00
Philippe GRAND
30e426e487 Standardize and update code 2018-09-19 16:21:52 +02:00
Laurent Destailleur
824b572bd0 FIX Amount when using mutlicurrency on PDF 
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2018-09-19 15:03:24 +02:00
Laurent Destailleur
2b67da3f34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-09-19 14:52:43 +02:00
Laurent Destailleur
2643b6e1dd
Merge pull request #9558 from grandoc/new_branch_18_09_2018 
Standardize and update code
 2018-09-19 14:26:28 +02:00
Frédéric FRANCE
cdbb79a26c
correct typo in multicurrency doc pdf 2018-09-19 09:26:56 +02:00
Laurent Destailleur
2ec02afa8b Fix nb of module 2018-09-19 01:14:55 +02:00
Philippe GRAND
4536993fdc Standardize and update code 2018-09-18 17:34:01 +02:00
Philippe GRAND
c3db591d7b Standardize and update code 2018-09-18 17:31:01 +02:00
Philippe GRAND
73d161833a Standardize and update code 2018-09-18 17:26:20 +02:00
Philippe GRAND
d021a3d5af Standardize and update code 2018-09-18 17:24:10 +02:00
Philippe GRAND
30601accc3 Standardize and update code 2018-09-18 17:15:06 +02:00
Philippe GRAND
f28f3d12c2 Standardize and update code 2018-09-18 17:10:47 +02:00
Philippe GRAND
ac3efe1d5b Standardize and update code 2018-09-18 17:06:25 +02:00
Philippe GRAND
ad6ecc6231 Standardize and update code 2018-09-18 16:49:20 +02:00
Philippe GRAND
b4692f0812 fix merge 2018-09-18 16:45:06 +02:00
Laurent Destailleur
99d214abd5 Fix family of module Payment of employee salaries 2018-09-18 16:38:51 +02:00
Philippe GRAND
c3bbe70e2d fix merge 2018-09-18 16:38:14 +02:00
Philippe GRAND
ad061f4e13 Standardize and update code 2018-09-18 11:14:21 +02:00
Philippe GRAND
c08f443f0a Standardize and update code 2018-09-18 11:09:56 +02:00
Philippe GRAND
72f906683f Standardize and update code 2018-09-18 11:02:18 +02:00
Philippe GRAND
d1a27b33fb Standardize and update code 2018-09-17 17:28:05 +02:00
Philippe GRAND
b06516180b Standardize and update code 2018-09-17 15:06:41 +02:00
Laurent Destailleur
797de131a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-17 02:26:15 +02:00
Laurent Destailleur
f3f18bf8cb Fix sql 2018-09-17 02:23:11 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-16 12:54:39 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Laurent Destailleur
eebd329c7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/main.lang
	htdocs/stripe/transaction.php
 2018-09-16 09:50:13 +02:00
Laurent Destailleur
55e7989552 FIX #9043 2018-09-16 09:42:30 +02:00
Laurent Destailleur
2c8064967b Code comment 2018-09-16 09:31:06 +02:00
Laurent Destailleur
34b75828d3 Work on fix for #9043 2018-09-16 09:27:36 +02:00
Laurent Destailleur
6ba2127377
Merge pull request #9516 from grandoc/new_branch_15_09_2018 
New branch 15 09 2018
 2018-09-15 23:59:10 +02:00
Laurent Destailleur
69dcdcbe75
Merge pull request #9509 from grandoc/new_branch_14_09_2018 
Standardize and update code
 2018-09-15 17:30:14 +02:00
Philippe GRAND
0654b7b0ef Standardize and update code 2018-09-15 10:49:40 +02:00
Philippe GRAND
73c26a2d04 Standardize and update code 2018-09-15 10:47:50 +02:00
Philippe GRAND
fa1521d948 Standardize and update code 2018-09-14 15:09:23 +02:00
Philippe GRAND
ca9b1f155f Standardize and update code 2018-09-14 14:05:19 +02:00
Philippe GRAND
33d9e24bd6 Standardize and update code 2018-09-14 11:58:49 +02:00
John BOTELLA
d1321e5a7b change new PDF version 2018-09-14 09:54:39 +02:00
John BOTELLA
ec23cd0da4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_PDF_DOCUMENT_COLUMN_new_files 2018-09-14 09:54:14 +02:00
John BOTELLA
477acb2e4c change new PDF version 2018-09-14 09:48:15 +02:00
Laurent Destailleur
16ed582124 Add comment 2018-09-14 01:45:03 +02:00
Frédéric FRANCE
5862a5e2ee
printing remove no camelcaps function 2018-09-13 11:13:32 +02:00
Philippe GRAND
ffad80eef6 Standardize and update code 2018-09-13 09:45:07 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Laurent Destailleur
963d5eeddf
Merge pull request #9387 from frederic34/camelCaps2 
start changing phpcs:ignore
 2018-09-12 21:14:34 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 20:21:35 +02:00
Philippe GRAND
06cde1c35f Standardize and update code 2018-09-12 19:32:30 +02:00
Philippe GRAND
04017367f9 Standardize and update code 2018-09-12 19:24:45 +02:00
ias-ceo
fece67b629 use correct resultset 2018-09-12 19:00:19 +02:00
Laurent Destailleur
cb174c3d1a
Merge pull request #9455 from IAS-SYSTEMS-CSC/develop 
Fix : use correct resultset
 2018-09-12 18:59:45 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
81f4bae159
Merge pull request #9461 from grandoc/new_branch_11_09_2018 
New branch 11 09 2018
 2018-09-12 18:15:03 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Philippe GRAND
b8df44167a Standardize and update code 2018-09-12 15:09:12 +02:00
Laurent Destailleur
729d03862f Fix warning 2018-09-12 15:02:59 +02:00
Philippe GRAND
69bf43f851 Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018 2018-09-12 14:48:50 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Laurent Destailleur
af2e19eba8 Replace skype module with social networks module to support more fields 2018-09-12 10:55:45 +02:00
Philippe GRAND
c51a0ef901 Standardize and update code 2018-09-12 10:10:07 +02:00
ias-ceo
b4691df8d9 use correct resultset 2018-09-10 17:29:29 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date 2018-09-09 11:25:59 +02:00
Laurent Destailleur
0ef17fe581 FIX Problems with permissions of module to record payment of salaries 2018-09-07 13:32:56 +02:00
Frédéric FRANCE
ab4ae0f7bb
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-06 21:28:30 +02:00
Frédéric FRANCE
70ba223788
move phpcs:ignore 2018-09-06 21:27:18 +02:00
Frédéric FRANCE
cbf4a20a13
move phpcs:ignore 2018-09-06 19:03:09 +02:00
Frédéric FRANCE
3ecf788438
move phpcs:ignore 2018-09-06 18:29:01 +02:00
Laurent Destailleur
f7c87a9ad3 Clean cron init 2018-09-05 22:46:08 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 21:02:16 +02:00
Frédéric FRANCE
85df267a5b
move phpcs:ignore 2018-09-05 20:36:44 +02:00
Laurent Destailleur
4ac67e6409 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:31:10 +02:00
Frédéric FRANCE
f7c3ca9d20
move phpcs:ignore 2018-09-05 18:49:06 +02:00
Laurent Destailleur
3650dc3ec9 FIX #8452 2018-09-05 15:25:47 +02:00
Frédéric FRANCE
ecc6c118a6
move phpcs:ignore 2018-09-04 23:26:37 +02:00
Frédéric FRANCE
7799774ca1
move phpcs:ignore 2018-09-04 22:52:55 +02:00
Frédéric FRANCE
3847df1de6
move phpcs:ignore 2018-09-04 21:53:53 +02:00
Frédéric FRANCE
c6cef85ccd
move phpcs:ignore 2018-09-04 21:16:17 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
fd6281b364
move phpcs:ignore 2018-09-04 20:00:09 +02:00
Frédéric FRANCE
1ae1afe843
move phpcs:ignore 2018-09-04 08:09:48 +02:00
Frédéric FRANCE
d08b68e8ed
move phpcs:ignore 2018-09-03 20:38:52 +02:00
Frédéric FRANCE
5f4a922c1d
move phpcs:ignore 2018-09-03 19:00:37 +02:00
Philippe GRAND
7a0c19485e fix merge 2018-09-03 09:34:08 +02:00
Frédéric FRANCE
e4946cc8eb
move phpcs:ignore 2018-09-03 00:03:17 +02:00
Frédéric FRANCE
9c3352d2de
move phpcs:ignore 2018-09-02 23:44:53 +02:00
Frédéric FRANCE
489074af5c
move phpcs:ignore 2018-09-02 23:25:10 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore 2018-09-02 22:05:19 +02:00
Laurent Destailleur
0bf850c1ea Fix phpcs 2018-09-02 16:26:00 +02:00
Laurent Destailleur
3baaa2e975 Fix syntax error 2018-09-02 16:18:08 +02:00
Laurent Destailleur
b34731afb4
Merge pull request #9385 from frederic34/patch-15 
Update html_cerfafr.modules.php
 2018-09-02 15:38:19 +02:00
Laurent Destailleur
91809de1c3
Merge pull request #9383 from frederic34/patch-13 
Update doc_generic_user_odt.modules.php
 2018-09-02 15:35:54 +02:00
Philippe GRAND
5cd9557318 Standardize and Update code 2018-09-01 23:12:20 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Frédéric FRANCE
49a1e33fc9
Update html_cerfafr.modules.php 2018-09-01 16:23:30 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Frédéric FRANCE
ae52b737b3
Update doc_generic_user_odt.modules.php 2018-09-01 15:29:41 +02:00
Philippe GRAND
17e349eba2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:27:53 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Philippe GRAND
bd473059ae precise label comment 2018-09-01 14:13:05 +02:00
Laurent Destailleur
26cff9e11f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/blockedlog.lang
	htdocs/stripe/config.php
 2018-09-01 14:13:01 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
b6f4b1dff7
Merge pull request #9363 from frederic34/patch-21 
Update modSociete.class.php
 2018-09-01 13:31:23 +02:00
Philippe GRAND
d8e6492e93 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +02:00
Philippe GRAND
0e5d4206c9 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-01 12:47:34 +02:00
Josep Lluís
bfaf7ae473 Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-09-01 12:44:16 +02:00
Josep Lluís
79ee31df5c Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-09-01 12:43:02 +02:00
Laurent Destailleur
8bd231adb0
Merge pull request #9357 from joseplluis/patch-3 
FIX undefined rights_class on modules may lose setup when module disabled
 2018-09-01 12:42:22 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018 
New branch 29 08 2018
 2018-09-01 12:11:01 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix 2018-09-01 09:40:50 +02:00
Frédéric FRANCE
3b2e7732c2
function Comment Missing 2018-08-31 22:49:11 +02:00
Frédéric FRANCE
c2e49c82f8
function Comment Missing 2018-08-31 22:34:02 +02:00
Philippe GRAND
3a8bde227b Standardize and update code 2018-08-31 19:26:08 +02:00
Frédéric FRANCE
2eade6ea68
Update modSociete.class.php 2018-08-30 23:22:06 +02:00
Josep Lluís
d70e548f94
Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-08-30 18:12:02 +02:00
Philippe GRAND
2e66c65650 WTF... 2018-08-30 12:03:20 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Philippe Grand
0ab593fdb1
Merge branch 'develop' into new_branch_29_08_2018 2018-08-29 12:47:01 +02:00
Philippe GRAND
d948c9e2db Fix white spaces 2018-08-29 12:42:55 +02:00
Laurent Destailleur
0eb4f8bb96 NEW Can set the datestart and dateend of cron job into module descriptor 2018-08-29 11:47:20 +02:00
Philippe Grand
fa992c3e6d
Update modules_import.php 2018-08-28 10:44:18 +02:00
Philippe GRAND
65af8f902f Update and standardize code 2018-08-28 09:44:54 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018 
Update and standardize code
 2018-08-28 02:13:28 +02:00
Frédéric FRANCE
d8bf4a0ecf
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-25 09:07:04 +02:00
Laurent Destailleur
7a35b560a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-23 19:51:52 +02:00
Philippe GRAND
74ce0bfea6 Standardize and update code 2018-08-23 16:54:24 +02:00
Philippe GRAND
aafa16afa5 Update and standardize code 2018-08-23 11:11:46 +02:00
Philippe GRAND
95349365ba Update and standardize code 2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Philippe GRAND
d91b1fd895 Update and standardize code 2018-08-22 11:06:34 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
c76a33fb4f
remove superfluous spaces 2018-08-21 20:12:27 +02:00
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 19:59:07 +02:00
Laurent Destailleur
21a9fd625f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-21 14:15:22 +02:00
Laurent Destailleur
5f6c165fb6 Module builder is stable 2018-08-21 14:14:27 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Laurent Destailleur
9dbb0eaab0 Fix cron task label 2018-08-21 14:01:03 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration 
function declaration
 2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Laurent Destailleur
b40e32b8c3
Merge pull request #9264 from grandoc/new_branch_17_08_2018 
standardize code
 2018-08-21 12:52:34 +02:00
Laurent Destailleur
d8365e9260 Module DAV 2018-08-19 02:17:12 +02:00
Philippe GRAND
c48211ad70 Update and standardize code 2018-08-17 19:31:22 +02:00
Philippe GRAND
edb566501d Update and standardize code 2018-08-17 18:54:41 +02:00
Philippe GRAND
78e9e05f95 Update and standardize code 2018-08-17 18:35:51 +02:00
Frédéric FRANCE
d68f176e7e
replace obsolete phpcs tags 2018-08-16 14:59:06 +02:00
Laurent Destailleur
4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-16 14:50:04 +02:00
Laurent Destailleur
4c52384609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-16 14:48:42 +02:00
Laurent Destailleur
0c654bd452 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-16 14:47:56 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Frédéric FRANCE
69a7af88e7
function declaration 2018-08-15 18:14:02 +02:00
Frédéric FRANCE
54a078149a
function declaration 2018-08-15 17:34:35 +02:00
Frédéric FRANCE
c0478cb42f
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-14 15:54:40 +02:00
Frédéric FRANCE
a0a6afc224
return comment 2018-08-14 12:23:10 +02:00
florian HENRY
20309665e6 fix : ODT project substitution 2018-08-14 10:45:08 +02:00
Frédéric FRANCE
d30874750f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-14 09:02:12 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
0b5a87a443
Update modules_holiday.php 2018-08-13 17:25:41 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Laurent Destailleur
2d571acc03 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
 2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
John BOTELLA
6fad0ea5bd Add retained warranty to pdf 2018-08-10 16:03:39 +02:00
gauthier
391230babc FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281) 2018-08-10 15:39:49 +02:00
Frédéric FRANCE
79aaddbb66
test phpcs v3 2018-08-09 14:46:00 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
Laurent Destailleur
8d54df4263 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-08-08 17:31:23 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
Ferran Marcet
5ce31f65a4 Fix: Bad position when document have incoterms/notes 2018-08-07 11:40:11 +02:00
Juanjo Menent
788060aa28
Merge pull request #9178 from aspangaro/9.0_a3 
NEW : Add project on salaries
 2018-08-02 11:19:34 +02:00
florian HENRY
ceb85cfa45 fix : odt project and task extrafields management 2018-07-31 17:29:08 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3 2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing 2018-07-26 19:05:34 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Laurent Destailleur
d871b8964f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:40 +02:00
Laurent Destailleur
20f178fdfe Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/functions.lib.php
 2018-07-24 19:22:00 +02:00
Laurent Destailleur
3e54ee5df7
Merge pull request #9131 from fappels/7.0_Fix_syslog_infinite_loop 
Fix chromephp firephp Syslog infinite loop
 2018-07-24 16:53:32 +02:00
Frédéric FRANCE
4341e367d2
remove % in supplier order pdf 2018-07-23 10:30:28 +02:00
fappels
b697307bac Fix chromephp firephp Syslog infinite loop. 
When chromephp/firephp not found ->trans causes infinite loop. Can
happen when files moved to other server or location.
 2018-07-22 10:41:39 +02:00
Laurent Destailleur
2c7029850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
 2018-07-21 20:28:26 +02:00
Laurent Destailleur
1d8c42265c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modFacture.class.php
 2018-07-21 20:26:19 +02:00
Laurent Destailleur
a1180f79bd Fix missing customer code and ref customer 2018-07-21 12:56:18 +02:00
Laurent Destailleur
41605ed4a7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-16 11:29:47 +02:00
Laurent Destailleur
c94437c3cf Fix file in wrong dir 2018-07-16 10:14:51 +02:00
Laurent Destailleur
76c6f28d85
Merge pull request #9035 from grandoc/new_branch_29_06_2018 
update code
 2018-07-16 10:09:46 +02:00
Laurent Destailleur
6bf4ef5ef4
Fix double " 
Fix double "
 2018-07-16 10:09:13 +02:00
Laurent Destailleur
e72e56ce2d
Merge pull request #9041 from grandoc/new_branch_02_07_2018 
update description code
 2018-07-16 10:03:54 +02:00
Laurent Destailleur
9b644fb92f
Merge pull request #9054 from grandoc/new_branch_05_07_2018 
docs: complete comments
 2018-07-15 20:12:21 +02:00
Laurent Destailleur
29c76a3f56
Merge pull request #9090 from grandoc/new_branch_10_07_2018 
New branch 10 07 2018
 2018-07-15 19:52:07 +02:00
Philippe GRAND
6945680e03 update code and typo 2018-07-12 10:11:42 +02:00
Philippe GRAND
72adc485f0 Docs : Update and complete 2018-07-10 22:32:55 +02:00
Philippe GRAND
0d10722a7f Docs : Update and complete 2018-07-10 14:57:23 +02:00
Laurent Destailleur
64517d4c0b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-07-10 14:06:51 +02:00
Laurent Destailleur
5f52dfa873 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-10 14:02:40 +02:00
Laurent Destailleur
3231f0031c
Merge pull request #9085 from grandoc/new_branch_10_07_2018 
Docs : Update and complete
 2018-07-10 10:43:32 +02:00
Philippe GRAND
243bc49a90 Docs : Typo 2018-07-10 09:38:05 +02:00
Philippe GRAND
b92190ac69 Docs : Update and complete 2018-07-10 09:32:55 +02:00
Philippe GRAND
df1bead49b Docs : update and complete comments 2018-07-09 19:04:50 +02:00
Philippe GRAND
b4b3e33e3e Docs : update and complete comments 2018-07-09 17:22:34 +02:00
Laurent Destailleur
3cda462faf
Merge pull request #9065 from aspangaro/9.0_a1 
Add customer accountancy code on deposit slips export
 2018-07-09 17:08:13 +02:00
Laurent Destailleur
f5d9403c7d Fix permission to see HR tab on user. All HR on same tabs. 2018-07-09 15:38:00 +02:00
Laurent Destailleur
ba6566867e
Merge pull request #9064 from grandoc/new_branch_06_07_2018 
fix : typo and update code
 2018-07-09 15:33:25 +02:00
Philippe GRAND
2c4d7c4835 Docs : update and complete 2018-07-09 14:06:59 +02:00
Philippe GRAND
12d4880e7b Docs : update and complete 2018-07-09 10:08:27 +02:00
Philippe GRAND
47e80123d5 Docs : update code 2018-07-07 11:36:46 +02:00
Philippe GRAND
fe5bfe3aaf Docs : update comments 2018-07-07 10:51:09 +02:00
Philippe GRAND
1e1ed485f5 Docs : update comments 2018-07-07 10:47:56 +02:00
Alexandre SPANGARO
655d55eae6 Add customer accountancy code on deposit slips export 2018-07-07 02:46:56 +02:00
Laurent Destailleur
a62fd8ef84 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 16:10:45 +02:00
Laurent Destailleur
45d1a14c8e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 16:10:37 +02:00
Laurent Destailleur
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +02:00
Philippe GRAND
988130d2a1 docs: complete comments 2018-07-05 17:04:11 +02:00
Philippe GRAND
4cbe3a5bc7 docs: complete comments 2018-07-05 17:01:47 +02:00
Maxime Kohlhaas
39f890d84a Fix TICKETSUP var name 2018-07-05 14:51:00 +02:00
Maxime Kohlhaas
74b9f87cab Fix ticket : missing file for numbering 2018-07-05 14:35:12 +02:00
Philippe GRAND
1cc73ae8ca docs: complete comments 2018-07-05 10:16:20 +02:00
Philippe GRAND
afd3868a8a docs: complete comments 2018-07-04 14:38:56 +02:00
Laurent Destailleur
38cd5180d9 FIX for migration from old versions 2018-07-03 20:11:59 +02:00
Laurent Destailleur
275f981545 FIX for migration from old versions 2018-07-03 20:08:55 +02:00
Laurent Destailleur
f7b8e09268 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
 2018-07-03 13:53:34 +02:00
Laurent Destailleur
f93f5bd6e0 Fix travis 2018-07-03 13:49:41 +02:00
Laurent Destailleur
12c43d7722 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:17 +02:00
Laurent Destailleur
4e7f9b1b4d
Merge pull request #9038 from hregis/8.0_multicompany 
Fix: possibility to overload permissions (multicompany sharing)
 2018-07-02 16:12:40 +02:00
Philippe GRAND
0aa58537bb update code comment 2018-07-02 15:07:00 +02:00
Philippe GRAND
74c45fa876 update code comment 2018-07-02 14:30:30 +02:00
Philippe GRAND
f43cce34c8 update code comment 2018-07-02 13:34:21 +02:00
Philippe GRAND
8497f56a04 update description code 2018-07-02 12:35:06 +02:00
Laurent Destailleur
9c5d34fc5f Fix translation 2018-07-02 12:26:32 +02:00
Laurent Destailleur
a2c89d8110 Fix page code in pdf 2018-07-02 12:25:09 +02:00
Laurent Destailleur
63f3143718 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-02 12:18:34 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Laurent Destailleur
11021353da Fix text in payment area of crabe pdf 2018-07-02 11:33:33 +02:00
Laurent Destailleur
93184c5f66 Fix travis 2018-07-01 23:57:54 +02:00
Regis Houssin
05c666c18b Fix: use numbering model corresponding to the entity of the object 2018-07-01 17:06:19 +02:00
Regis Houssin
80adac12c0 Fix: use object entity ID instead current entity 2018-07-01 16:01:30 +02:00
Laurent Destailleur
e06eb9e2fc Fix phpcs 2018-06-30 18:38:23 +02:00
Laurent Destailleur
751ddb46d2
Update pdf_blochet.class.php 2018-06-30 18:31:32 +02:00
Philippe GRAND
640f7697e4 update code 2018-06-30 11:45:49 +02:00
Laurent Destailleur
df96c5ca81
Merge pull request #8796 from defrance/patch-113 
introduce serial and document for holiday module
 2018-06-30 02:09:28 +02:00
Laurent Destailleur
e4388e63fa
Merge pull request #8891 from inoveaconseil/develop 
NEW: ADD url to see the last version of a external module
 2018-06-30 01:17:10 +02:00
John
008163628a New pdf documents using new column system 2018-06-26 08:03:25 +02:00
Laurent Destailleur
2649c136cf Fix SYSLOG_FILE_ONEPERSESSION 2018-06-24 14:31:03 +02:00
Laurent Destailleur
848c8cdc4b Fix mode SYSLOG_FILE_ONEPERSESSION to work as expected 2018-06-24 13:59:37 +02:00
Laurent Destailleur
1b5c5cfafb Fix select status 2018-06-24 10:42:07 +02:00
Laurent Destailleur
c405181393
Merge pull request #8987 from a-schild/develop 
Added mailing by thirdparty filtering by prospect type and status
 2018-06-24 10:31:09 +02:00
Marc de Lima Lucio
dc951029cd Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_pdf_note_incoterm 2018-06-20 10:31:35 +02:00
Marc de Lima Lucio
babc99465c FIX PR #8841 2018-06-20 10:22:43 +02:00
Marc de Lima Lucio
9fa9a716d5 FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts 2018-06-20 10:22:43 +02:00
Laurent Destailleur
fb2e820329 Fix menu not visible on jmobile 2018-06-19 13:17:46 +02:00
Laurent Destailleur
b364412a4a FIX Menu scheduled jobs not visible on jmobile conf 2018-06-19 13:10:13 +02:00
a-schild
baba0757d7 Added filtering by prospect type and status 
Added filtering by prospect type and status
 2018-06-19 11:46:03 +02:00
a-schild
211bb87e46 Moved functionality to select by categories 
Moved functionality to select by categories
 2018-06-19 11:45:27 +02:00
Philippe GRAND
62586c7c5d clean and upsdate code 2018-06-18 12:47:17 +02:00
a-schild
3e9bc75c9c Added mailings to thirdparties 
Allows to select third parties as mailing targets, depending client/lead
and active/inactive status
 2018-06-18 12:23:27 +02:00
Laurent Destailleur
5675c8fc01
Update modFournisseur.class.php 2018-06-18 11:26:03 +02:00
Laurent Destailleur
e993a41160
Update modFournisseur.class.php 2018-06-18 11:24:58 +02:00
Laurent Destailleur
5632228153
Update modFournisseur.class.php 2018-06-18 11:23:36 +02:00
Marc de Lima Lucio
a5898b830b Merge branch 'develop' of github.com:Dolibarr/dolibarr into 7.0 2018-06-14 10:48:09 +02:00
Marc de Lima Lucio
a80e1c601c NEW: supplier order/order lines export: add supplier product ref 2018-06-14 10:43:01 +02:00
Laurent Destailleur
8d1456fb7f
Merge pull request #8949 from atm-greg/Manage_product_units_in_supplier_proposal 
add product units management in supplier proposal documents
 2018-06-13 21:41:39 +02:00
Laurent Destailleur
b8e927d347
Merge pull request #8915 from grandoc/new_branch_04_06_2018 
clean and update code
 2018-06-13 20:16:19 +02:00
Laurent Destailleur
6fbdcea356 Code comment 2018-06-13 19:22:50 +02:00
atm-greg
d14f40f722 add product units management in supplier proposal documents 2018-06-12 14:36:32 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Philippe GRAND
909fa496e5 clean and update code 2018-06-04 17:37:17 +02:00
Laurent Destailleur
69dd11f7c6 Fix: Must use a standard (internationnal) date format. 2018-06-04 14:05:47 +02:00
Laurent Destailleur
eca66492ce
Merge pull request #8913 from aspangaro/8.0-a26 
NEW : Accountancy Add import on general ledger
 2018-06-04 14:02:34 +02:00
Alexandre SPANGARO
a3030e4057 Update works 2018-06-03 22:35:39 +02:00
Inovea Conseil
78b3067de3 NEW: ADD admin page for modulebuilder 
ADD custom README
ADD choice to generate about page and documentation folder
 2018-05-30 13:54:43 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines 
soft limit length of lines to 500 chars
 2018-05-30 11:19:29 +02:00
Laurent Destailleur
2ae9591d0d Fix english name 2018-05-29 11:10:21 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
Laurent Destailleur
fa252d5cbd
Merge branch 'develop' into FIX_6.0_pdf_note_incoterm 2018-05-25 11:59:22 +02:00
Laurent Destailleur
9d407cdc03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-25 11:27:04 +02:00
Laurent Destailleur
0e6aa3def3 Fix duplicate deprecated file 2018-05-25 11:26:50 +02:00
Laurent Destailleur
7f77f1bd5a
Merge pull request #8825 from atm-florian/develop_advtrgtml 
new : add adv targt emailing amdin with main feature level 1
 2018-05-25 11:10:51 +02:00
Laurent Destailleur
b9fbf13eba Fix look and feel v8 2018-05-25 09:36:49 +02:00
Laurent Destailleur
9f2f8ca7e0 Fix scrutinizer 2018-05-25 09:31:16 +02:00
Laurent Destailleur
23e2bb20d9 Look and feel v8 2018-05-24 12:32:04 +02:00
Laurent Destailleur
e51aa68284 Fix link to warehouses for events 2018-05-24 12:16:04 +02:00
Laurent Destailleur
488c0c030e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modProduct.class.php
 2018-05-23 18:09:25 +02:00
Laurent Destailleur
3a06918b16 FIX Missing extrafields in export of stock or products 2018-05-23 18:00:27 +02:00
Laurent Destailleur
d1d8494666 FIX Missing extrafields in export 2018-05-23 17:48:18 +02:00
Marc de Lima Lucio
111f3a9649 FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts 2018-05-23 11:11:33 +02:00
Laurent Destailleur
a1c799507a Fix $contactobject not always defined 2018-05-23 08:16:24 +02:00
florian HENRY
22cdbffb0a new : add adv targt emailing amdin with main feature level 1 2018-05-21 10:58:16 +02:00
Alexandre SPANGARO
e2665bd30e NEW : Accountancy Add import on general ledger 2018-05-19 07:29:17 +02:00
Laurent Destailleur
e503aeb2e5
Merge pull request #8787 from aspangaro/8.0-a24 
Update module assets
 2018-05-18 09:05:46 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00
Alexandre SPANGARO
cb815e5e3b Update works 2018-05-13 07:50:24 +02:00
Laurent Destailleur
9315d9c423 NEW Introduce permission "approve" for "leave request" like for "expense 
report"
 2018-05-10 18:56:21 +02:00
Laurent Destailleur
a65170ba2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 14:16:19 +02:00
Laurent Destailleur
0c35bc5284 Standardize code 2018-05-10 14:15:52 +02:00
Laurent Destailleur
3c6d1ccbac
Merge branch 'develop' into develop 2018-05-10 13:13:53 +02:00
Laurent Destailleur
2fb5de6136 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 12:30:14 +02:00
Laurent Destailleur
c094a6c43e Reorder permissions 2018-05-10 12:29:58 +02:00
Laurent Destailleur
afa9db2a88
Merge pull request #8752 from delcroip/patch-14 
FIX Add properly the project models
 2018-05-10 11:54:00 +02:00
Laurent Destailleur
9e807c1c01
Merge pull request #8751 from wdammak/patch-7 
Add models pdf to warehouse module
 2018-05-10 11:41:03 +02:00
BENKE Charlene
79bb8ef6c7
Update modHoliday.class.php 2018-05-07 22:47:24 +02:00
BENKE Charlene
3d268933a4
Create mod_holiday_madonna.php 2018-05-07 22:35:19 +02:00
BENKE Charlene
a20632d31d
Create mod_holiday_immaculate.php 2018-05-07 22:34:26 +02:00
BENKE Charlene
ffaff97af1
Create modules_holiday.php 2018-05-07 22:33:14 +02:00
BENKE Charlene
8546943898
Create index.html 2018-05-07 22:30:40 +02:00
atm-quentin
8cd6c72a2f NEW advanced rights 2018-05-07 10:04:43 +02:00
wdammak
d038bf3e4b
Merge pull request #8 from Dolibarr/develop 
Update rep
 2018-05-06 17:01:44 +01:00
delcroix Patrick
a2c93e56ae
fixAdd properly the project models 
Previous code was adding only the Task model (project model where actually push during the installation) and only one of the two model available.
 2018-05-06 13:36:37 +02:00
wdammak
fb81088a4b
Add models warehouse and movement 2018-05-05 13:44:11 +01:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
 2018-05-05 14:40:39 +02:00
wdammak
c269699679
Add model_pdf to warehouse module 2018-05-05 13:33:34 +01:00
Laurent Destailleur
f6ca1eb624 Fix permission name 2018-05-05 13:24:46 +02:00
atm-quentin
ec5e84075e NEW Rights to ignore price min 2018-05-03 10:18:38 +02:00
wdammak
2cf1aa967c
Add warehouse models pdf 2018-05-03 01:01:05 +01:00
Laurent Destailleur
cb76d2ce0f Better logging 2018-05-01 18:58:19 +02:00
Laurent Destailleur
8be8249f85 Clean code, fix warnings 2018-05-01 12:40:42 +02:00
Laurent Destailleur
f50a6149d5 Look and feel v8 (menu statistics at end) 2018-05-01 11:09:03 +02:00
Laurent Destailleur
55f982e504 Removed deprecated FPDI option and reorganise PDF setup page 2018-04-30 09:28:24 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Laurent Destailleur
e168240ab0 Debug module DAV 2018-04-29 18:32:15 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
ae412f228d NEW Experimental DAV module provides a public and private directory 2018-04-25 12:22:02 +02:00
Laurent Destailleur
32511422ab Fix PSR2 2018-04-22 20:08:29 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18 Remove useless $var 2018-04-22 18:51:03 +02:00
Laurent Destailleur
46e448a086 Fix default agenda view 2018-04-22 17:57:20 +02:00
Laurent Destailleur
f83369d268 Remove travis warnings 2018-04-22 11:27:26 +02:00
Laurent Destailleur
9eeaf5c3eb dol_syslog now strftime instead of dol_print_date 2018-04-21 12:22:21 +02:00
Laurent Destailleur
f6743484dd Better support of option COMPANY_AQUARIUM_CLEAN_REGEX 2018-04-21 00:58:42 +02:00
Laurent Destailleur
38d200d8a6 Fix left menu 2018-04-20 13:23:34 +02:00
Laurent Destailleur
7baf0eddbc NEW Add hidden option COMPANY_AQUARIUM_CLEAN_REGEX to clean generated 
accounting account.
 2018-04-20 01:10:57 +02:00
Laurent Destailleur
7256edc831 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-18 03:28:50 +02:00
Laurent Destailleur
013f95f54b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-18 00:02:51 +02:00
Laurent Destailleur
5713a048fe
Merge pull request #8632 from aspangaro/8.0-a21 
Fix Accountancy
 2018-04-17 21:30:16 +02:00
Alexandre SPANGARO
e0c0f7fd9b Fix Accountancy 2018-04-17 20:04:55 +02:00
Laurent Destailleur
fee4966219
Merge pull request #8601 from frederic34/esign 
NEW add optional esign field in pdf propal
 2018-04-17 16:12:53 +02:00
atm-greg
90f1ab8af4 add hooks on supplier documents 2018-04-16 06:46:22 +02:00
Laurent Destailleur
e2838aa074 NEW Show also size in bytes in tooltip if visible unit is not bytes 2018-04-15 17:58:13 +02:00
Frédéric FRANCE
46cfe1e2e7
Merge remote-tracking branch 'upstream/develop' into esign 2018-04-15 14:33:03 +02:00
Frédéric FRANCE
d4c03230a0
add optional esign field in pdf propal 2018-04-15 11:34:21 +02:00
Regis Houssin
d97c052d08 Fix: broken $pdf object ! 2018-04-14 10:41:38 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16 
NEW Add files management on products lot
 2018-04-13 00:57:13 +02:00
All-3kcis
f7e58f3c73 Add files management on products lot 2018-04-12 15:10:37 +02:00
Laurent Destailleur
ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
 2018-04-12 13:31:14 +02:00
Laurent Destailleur
e437989853 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-12 13:25:27 +02:00
atm-greg
ae34fa6fbd add supplier contact name on supplier documents 2018-04-11 17:42:26 +02:00
Laurent Destailleur
419b225120 Clean code 2018-04-07 21:11:58 +02:00
Laurent Destailleur
d7d9c8c338 Fix module descriptor of dav module 2018-04-07 21:04:08 +02:00
Laurent Destailleur
98b9f6bb47 DAV module 2018-04-07 19:12:41 +02:00
Laurent Destailleur
049b9b2a5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-06 14:19:25 +02:00
Laurent Destailleur
8e778df0ff Debug stripe module 2018-04-06 14:05:07 +02:00
Alexandre SPANGARO
06dc70df09 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-05 20:42:28 +02:00
Laurent Destailleur
48ff89c63b Fix regression 2018-04-05 19:52:54 +02:00
Laurent Destailleur
0223d54107 FIX Support or multicompany for sheduled jobs 
FIX Use priority to define order of sheduled jobs

Conflicts:
	htdocs/cron/list.php
 2018-04-05 12:38:42 +02:00
Laurent Destailleur
0de65b7822 FIX Support or multicompany for sheduled jobs 
FIX Use priority to define order of sheduled jobs
 2018-04-05 12:36:14 +02:00
Alexandre SPANGARO
a5428cc8c7 NEW Module Assets 2018-04-01 21:26:52 +02:00
Philippe GRAND
5b1efc2227 New [*use loadLangs for translation files*] and update code 2018-03-27 19:30:31 +02:00
Laurent Destailleur
6eca679f68
Merge pull request #8453 from OPEN-DSI/fix-import-insert-foreign-key 
FIX #7581 Import INSERT foreign key
 2018-03-27 17:47:45 +02:00
Laurent Destailleur
d41908e52a
Update import_xlsx.modules.php 2018-03-27 17:46:50 +02:00
Laurent Destailleur
86c4bb23ad
Update import_csv.modules.php 2018-03-27 17:46:28 +02:00
Laurent Destailleur
3eee68c404 NEW Prototype of a module DAV 2018-03-27 16:18:12 +02:00
François J
e892089afd Fix Import INSERT foreign key 
Check the row referencing this foreign key exists first
instead of always trying to perform an UPDATE.
 2018-03-26 17:52:43 +02:00
Laurent Destailleur
9f11cf77df Merge ticket css in main css 2018-03-26 15:45:56 +02:00
Laurent Destailleur
852191010a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-25 15:29:11 +02:00
Laurent Destailleur
934d2d8881 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-25 15:27:31 +02:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
florian HENRY
1feb22ea9c fix user right on modRessource 2018-03-21 22:24:11 +01:00
Laurent Destailleur
423bd56646
Merge pull request #8423 from grandoc/new_branch_20_03_2018 
New [*use loadLangs for translation files*]
 2018-03-21 20:39:40 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
Laurent Destailleur
200fd88132 Fix output message in log rotation job 2018-03-21 13:56:24 +01:00
Philippe GRAND
0d7ffefc8f New [*use loadLangs for translation files*] 2018-03-20 19:47:25 +01:00
Laurent Destailleur
09beb9186e
Merge pull request #8403 from atm-maxime/develop 
New filter on product supplier price import update
 2018-03-18 14:18:20 +01:00
Philippe GRAND
68b1e5f8fd New [*use loadLangs for translation files*] 2018-03-16 17:40:19 +01:00