Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

10032 Commits

Author SHA1 Message Date
Laurent Destailleur
9d4e672475 FIX Debug direct debit module and credit transfer module 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
 2020-08-04 21:12:03 +02:00
Laurent Destailleur
a3f7cbd63d css 2020-08-04 21:07:56 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Tim Otte
0e03578e91 Fixed translation of product units in documents 2020-08-04 11:51:40 +02:00
Laurent Destailleur
f62717a16a FIX Debug module direct debit order. Solve conflict with credit transfer 2020-08-03 20:16:33 +02:00
Laurent Destailleur
8c34acbf55 FIX Warning if no bank account defined 2020-08-03 14:11:15 +02:00
Laurent Destailleur
e64b8eaf40 Fix debug credit transfer module 2020-08-03 11:21:13 +02:00
Laurent Destailleur
3bfd7644a4 Fix return link 2020-08-01 20:17:49 +02:00
Laurent Destailleur
8c06e3577d Fix several trouble with diret debit module and credit transfer module 2020-07-27 19:33:24 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-07-25 00:22:47 +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
091fbb2824 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-06 11:55:06 +02:00
Laurent Destailleur
9b1163cfb8 Fix menu organisation. 2020-07-06 11:52:28 +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
9cd8c3738f Fix trans 2020-07-05 23:18:19 +02:00
Laurent Destailleur
54a77a604c FIX Missing token 2020-07-05 12:55:08 +02:00
Laurent Destailleur
d18ce3b39e Look and feel v12 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-07-05 12:54:42 +02:00
Laurent Destailleur
e256ce5c4b Debug credit transfer module 2020-07-03 19:27:23 +02:00
Laurent Destailleur
b88e159495 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
 2020-07-03 00:46:18 +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
Laurent Destailleur
16b327f106 Debug module credit transfer 2020-07-02 15:45:11 +02:00
Laurent Destailleur
ae0c738980 FIX Entry from stripe intent were reported into SEPA payments 
FIX Label of popup on thirdparty
FIX Missing the tooltip when creating bank account
 2020-07-01 19:42:28 +02:00
Laurent Destailleur
e2a9743dd4 Debug module credit transfer 2020-07-01 14:19:47 +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
cf899364f3 Merge pull request #14116 from aspangaro/12p1 
FIX: SQL Problem in customer invoice list
 2020-06-28 21:13:17 +02:00
Laurent Destailleur
a11f7d1070 Update list.php 2020-06-28 21:11:25 +02:00
Alexandre SPANGARO
0c60c9fd0d FIX: SQL Problem in social contribution list 2020-06-25 20:53:03 +02:00
Laurent Destailleur
02e022ebfa Fix class not found for supplier credit. Class must be into 
commoninvoice
 2020-06-24 19:59:06 +02:00
Alexandre SPANGARO
ffaf7068d5 FIX: SQL Problem in customer invoice list 2020-06-24 14:03:16 +02:00
Laurent Destailleur
566c1aaf84 Fix for credit transfer module 2020-06-22 22:54:33 +02:00
Laurent Destailleur
b54c18730b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
 2020-06-20 12:25:08 +02:00
Laurent Destailleur
378db9ab9a Merge pull request #14099 from atm-florian/12.0 
fix: same feature on thirdparty extrafields transport to invoice as existing on orders
 2020-06-20 12:16:57 +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
8eb23c5ee5 Merge pull request #14103 from atm-florian/12_fix_invoicelist_filterbySalesRep 
fix f.fk_user_author unknow because after stange join with coma
 2020-06-20 12:14:48 +02:00
Laurent Destailleur
f24e73141e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-19 14:53:31 +02:00
Laurent Destailleur
15af3d68fc FIX #13877 2020-06-19 14:50:33 +02:00
florian HENRY
07923e0baf fix f.fk_user_author unknow because after stange join with coma 2020-06-19 10:08:19 +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 HENRY
a705cc41ae fix: same feature on invoice as on orders 2020-06-18 19:44:24 +02:00
florian HENRY
835f6d42d8 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2020-06-18 19:42:34 +02:00
florian HENRY
e82d71c949 fix: same feature on invoice as on orders 2020-06-18 19:42:23 +02:00
Laurent Destailleur
fded55ddef Fix sepa supplier count 2020-06-18 03:44:26 +02:00