lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,872 Commits 43 Branches 150 Tags 886 MiB
331db5e367
Commit Graph

9626 Commits

Author SHA1 Message Date
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Juanjo Menent
9bd5ed627f Fix travis issues 2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43 FIX: #14474 Error when deleting 2020-09-03 12:43:38 +02:00
Florian Mortgat
9b3f13458f FIX: missing entity check 2020-08-26 16:02:31 +02:00
Laurent Destailleur
1bd00ac775 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/card.php
 2020-07-25 00:17:28 +02:00
John Botella
fc1de5b4f3 Fix multicurecy option not applied 2020-07-23 11:10:18 +02:00
VERDOL Gauthier
55298317e3 FIX : wrong link to third invoice templates 2020-07-20 16:22:48 +02:00
Laurent Destailleur
1e9ae1bc02 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-07-06 11:32:04 +02:00
Laurent Destailleur
2629a98851 Fix regression 2020-07-06 11:31:05 +02:00
Laurent Destailleur
053a1a2230 Fix duplicate code 2020-07-06 11:22:30 +02:00
Laurent Destailleur
59049cd047 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-03 00:41:32 +02:00
Laurent Destailleur
53c5ec51b8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-03 00:40:59 +02:00
Laurent Destailleur
18fa4c4105
Update card.php 2020-07-03 00:38:31 +02:00
gauthier
6553c40bea FIX : create a deposit with amount using comma didn't work 2020-06-30 11:23:55 +02:00
Laurent Destailleur
5a53a16c17
Merge pull request #14101 from mistraloz/patch-5 
Fix: Bug when delete payment when already deleted in account
 2020-06-20 12:15:59 +02:00
Laurent Destailleur
da9c25348e
Update paiement.class.php 2020-06-20 12:15:48 +02:00
Laurent Destailleur
15af3d68fc FIX #13877 2020-06-19 14:50:33 +02:00
Mistral Oz - LWEP
2f7bb18e2b
Fix: Bug when delete payment when already deleted in account 
Related to : 
https://github.com/Dolibarr/dolibarr/blame/11.0/htdocs/compta/bank/class/account.class.php#L1976

Mistake between id / rowid. I prefere add the fix here (but a fix in account class can be also a good fix). 
And best fix may use setter to do it (but to complicated : maybe latter ? i may check it in september if you want in all CommonObject properties)
 2020-06-18 20:56:46 +02:00
Florian Mortgat
3d69a1dc70 FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn 2020-06-17 11:06:31 +02:00
Laurent Destailleur
40e16672e3 FIX BlindBoolean SQL injection reported by Christian Weiler 
<sak1.s3curity@gmail.com>
 2020-06-15 15:08:52 +02:00
Laurent Destailleur
941362e683 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture.class.php
 2020-06-07 18:59:49 +02:00
Laurent Destailleur
4020d97362 FIX Can create a credit note on situation invoice if previous is also 
credit note
 2020-06-07 18:36:58 +02:00
Laurent Destailleur
180a0a4557 Info for debug 2020-06-07 18:30:46 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:00:24 +02:00
Florian Mortgat
c393f8149c FIX: when creating a VariousPayment, the value date is not copied onto the AccountLine that gets created at the same time, so the bank transaction's value date will be the payment date instead of the payment's value date 2020-06-04 11:29:51 +02:00
Laurent Destailleur
2b317120d3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/facture/card.php
 2020-05-31 00:25:33 +02:00
kamel
1e208e537f FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note 2020-05-29 16:24:07 +02:00
Laurent Destailleur
537b291fab Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/bons.php
 2020-05-28 12:24:55 +02:00
Florian Mortgat
954c29786e FIX 10.0 - pagination in prelevement/bons.php 2020-05-27 12:15:42 +02:00
gauthier
f3582d891a FIX : We must only rename current bank receipt 2020-05-19 15:35:37 +02:00
Laurent Destailleur
9336828710 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/expedition/class/expedition.class.php
 2020-05-18 15:54:39 +02:00
ptibogxiv
a9d1519f96
FIX php error if multicompany disabled 2020-05-18 14:52:33 +02:00
Laurent Destailleur
92b245ae93 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/facture/card.php
 2020-05-14 16:34:24 +02:00
gauthier
fc2f2c6da7 FIX : wrong url param 2020-05-12 17:41:21 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Laurent Destailleur
d6887f3ca4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/list.php
	htdocs/core/class/notify.class.php
 2020-05-07 11:59:13 +02:00
gauthier
c14b6884e3 FIX : missing hook init + table class + $page not set 2020-05-05 10:03:19 +02:00
Laurent Destailleur
4c27ae6530 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/facture/card.php
 2020-04-30 18:47:18 +02:00
Laurent Destailleur
b1495e12ce FIX A variable was erased by a temporary variable 2020-04-30 18:45:00 +02:00
Laurent Destailleur
4564a5cffd
Update accounting-files.php 2020-04-24 19:01:08 +02:00
florian HENRY
a685026756 fix: remove php warning 2020-04-24 17:22:35 +02:00
Laurent Destailleur
b77892451f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-24 16:21:58 +02:00
Laurent Destailleur
21665cdc85 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-04-24 16:21:51 +02:00
Laurent Destailleur
df91780552 FIX Situation invoice take into account the credit notes. 2020-04-24 15:57:08 +02:00
Laurent Destailleur
42ee9845ad Report error 2020-04-24 15:21:02 +02:00
stickler-ci
2633e90890 Fixing style errors. 2020-04-23 15:03:14 +00:00
simicar29
ce94788dd9
Clean line extrafields when deleting recurring invoice 
Delete extrafields recurring invoice lines when deleting parent object
Delete extrafields when deleting a recurring invoice line
 2020-04-23 17:01:40 +02:00
stickler-ci
aebc04d30a Fixing style errors. 2020-04-23 14:33:11 +00:00
simicar29
b68e85703f
Clean line extrafields when deleting invoice 
Delete extrafields invoice lines when deleting parent object (sql syntax ok for mariadb & pgsql)
Delete extrafields when deleting an invoice line
 2020-04-23 16:29:22 +02:00