2
0
forked from Wavyzz/dolibarr
Commit Graph

10032 Commits

Author SHA1 Message Date
Laurent Destailleur
cad9a59d2a Add option to be able to find behaviour before the fix of list of
invoice in direct debit order.
2019-09-06 14:45:55 +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
bc0b8dfad0 FIX Consistency in direct debit order lists.
FIX Confirmation of deletion
2019-09-06 14:24:33 +02:00
Laurent Destailleur
bc7bf3b4b5 FIX bad consistency in list of invoice for direct debit order. 2019-09-06 13:44:02 +02:00
Laurent Destailleur
d1a5be20ea Fix wrong warning 2019-09-06 13:02:52 +02:00
ptibogxiv
5d81b0271d Update facture.class.php 2019-09-06 11:40:26 +02:00
ptibogxiv
fc75d72290 Update list.php 2019-09-06 11:35:52 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
bb81f66a1a Add phpunit test for Lessc 2019-09-06 10:36:49 +02:00
Laurent Destailleur
92e7d7bb26 Fix duplicate translation 2019-09-05 16:18:20 +02:00
atm-ph
f7fe3d2842 Fix set var in context attribute instead of object attribute 2019-09-04 16:30:55 +02:00
Laurent Destailleur
481a25cb8f The hook "moreFamily" must return payment into var "totalpayment" and no
more "paiement" (english replace french).
2019-09-03 17:39:19 +02:00
Laurent Destailleur
da3d230182 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.stickler.yml
	htdocs/takepos/invoice.php
2019-09-03 17:34:49 +02:00
Laurent Destailleur
84800257e8 Merge pull request #11799 from jtraulle/fix-11683-10.0
Fix #11682 Missing origin object ref and thirdparty ref in future ban…
2019-09-03 17:32:47 +02:00
Laurent Destailleur
7c07e64adc Update treso.php 2019-09-03 17:32:18 +02:00
Laurent Destailleur
65fee73b22 Update treso.php 2019-09-03 17:31:20 +02:00
Laurent Destailleur
28c4f86c79 Fix regression 2019-09-03 16:23:39 +02:00
Laurent Destailleur
33cb9f7df4 Merge pull request #11776 from OPEN-DSI/fix-facture-duedate-and-paid
FIX set due date in object in create invoice and set default paid in …
2019-09-03 15:21:19 +02:00
Frédéric FRANCE
32343fba24 Optimize invoice situation doc
with many many lines, it can be very very long to generate pdf
2019-09-03 13:43:44 +02:00
Laurent Destailleur
98459363df Merge pull request #11795 from jtraulle/fix-doxygen-examples
Fix Wrongly catched examples by Doxygen
2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +02:00
Laurent Destailleur
f2af28f0e1 Clean code 2019-08-31 02:08:26 +02:00
Jean Traullé
8f1fba6775 Fix #11682 Missing origin object ref and thirdparty ref in future bank entries 2019-08-30 23:56:52 +02:00
Jean Traullé
c32c7d48ba Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4 The deprecated method get_OutstandingBill has been removed. You can use
getOutstandingBills() instead.
2019-08-29 00:45:02 +02:00
VESSILLER
877867a6c2 FIX set due date in object in create invoice and set default paid in update invoice 2019-08-28 13:50:39 +02:00
atm-ph
5aa27a126a Fix trigger create on widthdraw is missing 2019-08-28 13:45:02 +02:00
Laurent Destailleur
e421b4b698 Trans 2019-08-28 10:12:39 +02:00
Laurent Destailleur
4b5d9e44b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 22:47:33 +02:00
Laurent Destailleur
45ff873064 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/html.form.class.php
2019-08-26 22:44:49 +02:00
Laurent Destailleur
f07d99ed9a Merge pull request #11730 from atm-ph/fix_9.0_missing_hooks
Fix wrong placement to print title and missing hook to print value
2019-08-26 17:14:50 +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
7c5fc9f3f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:43:33 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:41:06 +02:00
Laurent Destailleur
60b8982a74 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-08-26 16:39:39 +02:00
Laurent Destailleur
fc1381c056 Merge pull request #11739 from ptibogxiv/patch-239
Fix display context for takepos in invoice/list.php
2019-08-26 16:38:27 +02:00
Alexandre SPANGARO
76691925a4 FIX Missing div for buttons in tax, loan, various payment modules 2019-08-26 15:35:20 +02:00
ptibogxiv
7112fcee9a Update list.php 2019-08-24 15:54:14 +02:00
ptibogxiv
2be125e647 Fix display context for takepos in invoice list
fix for thirdparty name and create button
2019-08-24 15:47:17 +02:00
Regis Houssin
064ab389ed FIX wrong parameters (same error in branch 9, 10, develop) 2019-08-24 12:44:23 +02:00
atm-ph
f14f1c9190 Fix wrong placement to print title and missing hook to print value 2019-08-23 09:15:15 +02:00
Regis Houssin
2d59f6bb3d FIX avoid sql error if fk_project is empty during update 2019-08-23 07:59:36 +02:00
Laurent Destailleur
3339f89fc5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55 FIX name and position of hook FIX #11710 2019-08-22 12:30:14 +02:00
Laurent Destailleur
54203dda1f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/modules.php
2019-08-21 16:25:48 +02:00
Laurent Destailleur
def0311f9d Fix translation 2019-08-19 17:26:13 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
21fc089f58 FIX Translation of month 2019-08-19 10:18:38 +02:00