Commit Graph

9561 Commits

Author SHA1 Message Date
Laurent Destailleur
9acda3545e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:52:01 +01:00
Laurent Destailleur
c87fdc96ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/supplier/index.php
2020-01-28 17:51:32 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Pierre Ardoin
4cb423e5c7 Add un specific link to late invoices
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid customer invoices.
2020-01-27 09:49:49 +01:00
Laurent Destailleur
df478dc170 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-27 01:53:49 +01:00
Laurent Destailleur
7438f92912 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/compta/tva/document.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/card.php
2020-01-27 01:50:02 +01:00
Laurent Destailleur
cf6b9f7d03 Merge pull request #12918 from atm-florian/11_fixWithdrwLineList
fix SEPA lines with limit select and working pagination
2020-01-26 22:25:01 +01:00
Laurent Destailleur
14f1f98b59 Merge pull request #12919 from atm-florian/10_fixCreateSEPALimitAndPagination
10 fix create sepa limit and pagination
2020-01-26 22:24:11 +01:00
Pierre Ardoin
c64acb1a9c Permissions Issue
fixes an issue that displayed the "restricted area" banner despite user permissions.
2020-01-25 15:19:46 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-01-25 14:43:57 +01:00
Laurent Destailleur
f2771b3365 FIX #12896 2020-01-25 14:23:23 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
08d8670bb3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/product.class.php
2020-01-24 20:12:27 +01:00
Laurent Destailleur
209ebfbe2f Fix trans 2020-01-24 16:14:52 +01:00
Laurent Destailleur
923e315dae Debug cashfence feature 2020-01-24 15:59:36 +01:00
Laurent Destailleur
779cd94b0e Debug cashfence feature 2020-01-24 15:26:18 +01:00
florian HENRY
2f0144b19b Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11_fixWithdrwLineList 2020-01-24 13:22:24 +01:00
florian HENRY
dc3eafccb9 add hook into withdraw list 2020-01-24 13:22:04 +01:00
Laurent Destailleur
540713510e Fix load of segment prices not required for virtual stock change
virtual stock must include production (WIP)
2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45 Fix load of segment prices not required for virtual stock change
virtual stock must include production (WIP)
2020-01-23 20:59:18 +01:00
Laurent Destailleur
f2ab3426ea Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-23 19:42:22 +01:00
Laurent Destailleur
e1123c63a9 Fix field label 2020-01-23 19:42:00 +01:00
Laurent Destailleur
df90e432d4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/sociales/card.php
2020-01-23 19:39:05 +01:00
Laurent Destailleur
b74d37338b Fix trans 2020-01-23 19:37:34 +01:00
Laurent Destailleur
a44d534e64 Fix label 2020-01-23 19:32:34 +01:00
Laurent Destailleur
f59cb65a21 Fix label 2020-01-23 19:32:15 +01:00
Laurent Destailleur
423be8a139 FIX Label of status of social contribution 2020-01-23 19:30:02 +01:00
Laurent Destailleur
5d4ea0b4c4 FIX Label of status of social contribution 2020-01-23 19:28:56 +01:00
florian HENRY
62caf3cbfc fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:59:50 +01:00
florian HENRY
5ad5578f40 fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:47:00 +01:00
florian HENRY
210e0511d0 fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:45:16 +01:00
florian HENRY
fd0daad959 fix SEPA line with limit select and working pagination 2020-01-23 16:49:06 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
2020-01-22 14:10:46 +01:00
Laurent Destailleur
a9790f355d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 11:32:40 +01:00
Laurent Destailleur
dc1600b3c2 Fix responsive 2020-01-21 10:54:31 +01:00
Laurent Destailleur
2d07a08e55 Fix init of specimen 2020-01-21 00:22:57 +01:00
Laurent Destailleur
80483fc085 Fix init of specimen 2020-01-21 00:20:03 +01:00
Laurent Destailleur
92856788a3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:39:46 +01:00
Laurent Destailleur
5f64531e9b Fix look and feel v11 2020-01-20 12:39:25 +01:00
Laurent Destailleur
b8938b8d19 Fix look and feel v11 2020-01-20 02:18:00 +01:00
Laurent Destailleur
7c5485288b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 20:34:20 +01:00
Laurent Destailleur
62b9fbb67f Fix link 2020-01-19 20:33:55 +01:00
Laurent Destailleur
6b6c9efe5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:56:21 +01:00
Laurent Destailleur
5a702eb50c Fix filter on amount 2020-01-19 19:55:57 +01:00
Laurent Destailleur
99f679493b Fix search 2020-01-19 19:51:40 +01:00
Laurent Destailleur
526ae83e8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:16 +01:00
Laurent Destailleur
e679e05f57 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:04 +01:00
Laurent Destailleur
19ab802aaf Fix disabling of balance 2020-01-19 19:48:19 +01:00