Laurent Destailleur
e087edf005
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/ticket/class/ticket.class.php
2020-06-11 23:39:26 +02:00
Laurent Destailleur
2109a91992
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/takepos/admin/setup.php
2020-06-11 23:36:55 +02:00
Florian Mortgat
0a2099e0ac
FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat
2020-06-09 14:22:32 +02:00
Laurent Destailleur
c6a53d9b3d
Update pdf_blochet.class.php
2020-06-02 12:09:11 +02:00
DEMAREST Maxime (Indelog)
7189e060e0
Fix line heiht overflow for blochet template
...
Fixed if by adding dynamic line height calculation. Now line height depend on
bank field content or transmitter field content. You can use long text in this
fields.
2020-06-02 11:17:37 +02:00
Laurent Destailleur
dbac97a908
Fix several troubles into numbering modules.
...
Prefix for takepos moved from TK to TC (TK was already used for tasks)
2020-06-01 04:02:47 +02:00
Laurent Destailleur
156f09729e
Debug module Payment by credit transfer
2020-05-30 02:10:41 +02:00
Laurent Destailleur
2e0cf05e55
phpcs
2020-05-28 21:20:30 +02:00
Laurent Destailleur
3606ed2bda
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2020-05-28 20:17:26 +02:00
Laurent Destailleur
8360ca4b20
Update pdf_crabe.modules.php
2020-05-28 17:38:20 +02:00
Laurent Destailleur
bdc73b5cae
Update pdf_crabe.modules.php
2020-05-28 17:37:53 +02:00
atm-lena
edc6abcea8
FIX Rounding Total TVA in "crabe" model pdf
2020-05-28 15:19:37 +02:00
Laurent Destailleur
e37e45f984
Debug credit transfer
2020-05-27 22:35:55 +02:00
Laurent Destailleur
9e295d44f0
Code comment
2020-05-21 17:14:42 +02:00
Laurent Destailleur
92cbff7749
Clean code
2020-05-20 23:40:04 +02:00
Laurent Destailleur
106fe7bde6
Clean conflict between direct debit and direct credit orders.
2020-05-17 15:06:09 +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
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
