Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
87,205 Commits 35 Branches 179 Tags 1.7 GiB
c2bb0431f0
Commit Graph

3225 Commits

Author SHA1 Message Date
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
9cd8c3738f Fix trans 2020-07-05 23:18:19 +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
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
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
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
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
florian HENRY
a705cc41ae fix: same feature on invoice as on orders 2020-06-18 19:44:24 +02:00
florian HENRY
e82d71c949 fix: same feature on invoice as on orders 2020-06-18 19:42:23 +02:00
Laurent Destailleur
15dd1bd705 Merge 2020-06-14 21:50:40 +02:00
Laurent Destailleur
964f17c507 Fix escape fields 2020-06-14 21:49:25 +02:00
Laurent Destailleur
f9da31e658 Fix rounding 2020-06-14 21:49:19 +02:00
Laurent Destailleur
83263cc174 Fix supplier sepa 2020-06-14 21:49:12 +02:00
Laurent Destailleur
c386f4b2e3 Maxi debug of direct debit order 2020-06-08 11:43:20 +02:00
Laurent Destailleur
d1dba53f61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/modules.php
	htdocs/install/mysql/migration/repair.sql
 2020-06-07 19:40:17 +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
6123596ec9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/fichinter/list.php
 2020-05-31 00:28:40 +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
Tobias Sekan
58e32aa2ff Fix not wokring default values for date (re...) 2020-05-23 14:22:30 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +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
Laurent Destailleur
e4611f2950 Fix filter on categories 2020-05-12 03:36:33 +02:00
Laurent Destailleur
ed68b73ef5
Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search 
NEW Add invoice stat graph and categ search
 2020-05-12 03:31:09 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Laurent Destailleur
f23451e1c9
Update facture.class.php 2020-05-07 23:04:52 +02:00
stickler-ci
7514a625fd Fixing style errors. 2020-05-07 20:11:59 +00:00
Vaadasch
db8596743c
Update facture.class.php 
Auto-update dates (if not empty) of services when cloning facture.

Actual code is only for month by month.

If empty (start or end) => do nothing

If set, update for next month if there is only 1d between what had been set and the start (or end) of the month.
If there is more than one day from start or end of the month => do nothing, because we're not sure the service is by month

Worst case scenario : the facture is cloned, the service is updated with new unwanted dates
User need to manually updates date : he would have done that either way
 2020-05-07 22:09:55 +02:00
atm-quentin
b6aa766c72 FIX stickler 2020-05-06 09:37:17 +02:00
atm-quentin
eab69c3a59 NEW multiselect categorie client stats facturation 2020-05-05 16:15:33 +02:00
atm-quentin
1b35380dda NEW stats invoice graph with 3 bars 2020-05-05 16:13:04 +02:00
Laurent Destailleur
797beef79f Fix 2020-05-05 15:26:41 +02:00