Commit Graph

93358 Commits

Author SHA1 Message Date
Laurent Destailleur
bc0ec86d4b
Merge pull request #15868 from ptibogxiv/13.0
update stripe-php 7.67.0
2021-01-04 13:55:20 +01:00
Laurent Destailleur
ef76c067e0 Add limit to 25000 2021-01-04 13:37:21 +01:00
Laurent Destailleur
8df5928e9c Fix selection must depends on enabled modules 2021-01-04 13:32:43 +01:00
Laurent Destailleur
8baa4c67ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-04 12:34:09 +01:00
Laurent Destailleur
5c104e344c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/ticket/list.php
2021-01-04 12:17:59 +01:00
Laurent Destailleur
71e6d20cb5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-04 12:08:27 +01:00
Laurent Destailleur
66bd040d2c Fix regression 2021-01-04 12:08:14 +01:00
Laurent Destailleur
c866e2c43e
Merge pull request #15869 from aspangaro/13b6
FIX: Loan - Missing fk_bank when we add payment with schedule & amount insurance / interest is inverted
2021-01-04 12:03:33 +01:00
Laurent Destailleur
1960c712df
Merge pull request #15866 from atm-maxime/fix_contactelement
Fix dict contact type element list
2021-01-04 12:02:57 +01:00
Laurent Destailleur
bb22f2ccaf
Update admin.lib.php 2021-01-04 12:02:41 +01:00
Laurent Destailleur
f829845405
Merge pull request #15861 from atm-maxime/fix_modulebuilder_template_buttons
Fix use dolGetButton in templates
2021-01-04 11:58:13 +01:00
stickler-ci
30cd041209 Fixing style errors. 2021-01-04 10:57:18 +00:00
Laurent Destailleur
82395d578b
Update myobject_card.php 2021-01-04 11:56:56 +01:00
Laurent Destailleur
8522d52748
Merge pull request #15864 from aspangaro/14a9
NEW: Accountancy - Add closure menu
2021-01-04 11:45:32 +01:00
Laurent Destailleur
05d6b6007e
Merge pull request #15867 from ptibogxiv/patch-404
NEW better date_valid on invoice
2021-01-04 11:44:20 +01:00
Juanjo Menent
d892d8c3c7 FIX: Bad dates filtering in the ticket list causes sql error 2021-01-04 10:59:45 +01:00
Alexandre SPANGARO
8f4fc046ec FIX: Loan - amount insurance / interest is inverted 2021-01-04 06:57:56 +01:00
Alexandre SPANGARO
433ddd61a7 FIX: Loan - Missing fk_bank when we add payment with schedule 2021-01-04 06:57:10 +01:00
ptibogxiv
984c355f39 update stripe-php 7.67.0 2021-01-03 23:37:44 +01:00
Maxime Kohlhaas
e5fbb963a3 Fix picto in template 2021-01-03 22:53:04 +01:00
Maxime Kohlhaas
5792995b1f Fix function call 2021-01-03 22:52:36 +01:00
ptibogxiv
9be1ce7d20
NEW better date_valid on invoice
need hour minutes and secondes for better order and search
2021-01-03 20:25:35 +01:00
Laurent Destailleur
b0738643fb FIX Solve problem with TZ 2021-01-03 18:42:45 +01:00
Maxime Kohlhaas
e190b010d3 Fix dict contact type element list 2021-01-03 16:05:04 +01:00
Laurent Destailleur
645b7694c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/db/DoliDB.class.php
2021-01-03 15:26:31 +01:00
Laurent Destailleur
8ad5dc81de GETPOST 2021-01-03 15:13:29 +01:00
Laurent Destailleur
f462f68056 Code comment 2021-01-03 15:10:33 +01:00
Laurent Destailleur
156e08894b Missing module 2021-01-03 14:32:10 +01:00
Laurent Destailleur
3cdcaa70d8 Fix warning 2021-01-03 14:29:22 +01:00
Francis Appels
236ff2d4e4 indent 2021-01-03 12:26:10 +01:00
Francis Appels
50d2e2d161 Debug reception contacts and list 2021-01-03 12:21:20 +01:00
Alexandre SPANGARO
43423650cd NEW: Accountancy - Add closure menu in auguria menu 2021-01-03 11:57:40 +01:00
Alexandre SPANGARO
a8ecea1a89 NEW: Accountancy - Add closure menu in stable version 2021-01-03 11:54:50 +01:00
Francis Appels
cbf6fe1f62 Clean code 2021-01-03 11:42:11 +01:00
Francis Appels
799927432c regression for user type on shipment contact 2021-01-03 10:53:48 +01:00
Maxime Kohlhaas
96411ed491 Fix use dolGetButton in templates 2021-01-02 18:05:18 +01:00
Laurent Destailleur
a3a7069c9c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:43:42 +01:00
Laurent Destailleur
821ef72d48 Fix warnings 2021-01-02 17:43:02 +01:00
Francis Appels
ade0e008e9 Some debug on Shipments.
Wrong object status on list paging.
Parameter error on link contact.
nbr Linked files not shown in tab badge.
2021-01-02 17:42:33 +01:00
Laurent Destailleur
46a5fa52da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:04:35 +01:00
Laurent Destailleur
2d1121031a var not defined 2021-01-02 17:04:08 +01:00
Laurent Destailleur
982f8eb95d Fix syntax error 2021-01-02 17:03:26 +01:00
Laurent Destailleur
150b338764 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:02:08 +01:00
Laurent Destailleur
7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-01-02 17:01:03 +01:00
Frédéric FRANCE
eb937f82c8
doxygen 2021-01-02 16:58:05 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Frédéric FRANCE
e4b5ec122e
syntax error 2021-01-02 16:38:19 +01:00
Frédéric FRANCE
ad3bc649af
doxygen 2021-01-02 16:23:09 +01:00
Laurent Destailleur
7f0f72ca47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:18 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00