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
89,109 Commits 35 Branches 179 Tags 1.7 GiB
9165ea9e67
Commit Graph

10097 Commits

Author SHA1 Message Date
VESSILLER
70ebc61c1f Module TakePos - NEW add numbering module for cash desk 2020-03-12 17:43:59 +01:00
Laurent Destailleur
967d4223c6 FIX #13277 2020-03-12 16:15:48 +01:00
Laurent Destailleur
d380da3f4c
Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink 
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
 2020-03-12 12:57:04 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
florian HENRY
eaa9d22783 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink 2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5 NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type 2020-03-12 09:44:43 +01:00
Laurent Destailleur
a9847f0d40
Merge pull request #13308 from TobiasSekan/NewCategoryFilterForBankList 
NEW category filter for bank list
 2020-03-11 16:50:12 +01:00
Laurent Destailleur
e1c7222172 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-09 20:39:05 +01:00
Laurent Destailleur
e66313d47e FIX use bad var to check if total is positive for each VAT rate when 
validating invoice.
 2020-03-09 20:06:47 +01:00
Laurent Destailleur
82f0d8a3bc Fix bad params 2020-03-09 17:38:47 +01:00
Tobias Sekan
9dd362a22c
NEW Category filter on bank list 2020-03-09 11:43:15 +01:00
Laurent Destailleur
3edc3dd382 Fix fields definition 2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d Fix table fields 2020-03-08 19:25:00 +01:00
Laurent Destailleur
054ffb7547 Depreciate variables not used by Dolibarr. 2020-03-06 14:38:06 +01:00
Laurent Destailleur
ad9d0a3472 Fix graph of product distribution when too much record 2020-03-06 12:45:02 +01:00
Laurent Destailleur
0bd2740779 NEW Can force position of legend of graph on right (instead of top) 2020-03-05 17:23:19 +01:00
Laurent Destailleur
aa1552dbc0 Enhance graphs 2020-03-05 00:17:16 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2020-03-04 01:56:50 +01:00
Laurent Destailleur
0b37c2c201 FIX #13263 2020-03-04 00:53:07 +01:00
Laurent Destailleur
71f19b4e5e FIX #13267 2020-03-04 00:38:04 +01:00
Laurent Destailleur
70d4e5d7e3 Fix button should not be visible 2020-03-03 23:51:17 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency 
NEW: add multicurrency columns to document lists
 2020-03-03 23:12:53 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files 
FIX ecm_files didnt match cause document ref contained "/"
 2020-03-03 23:09:02 +01:00
Laurent Destailleur
21173b8b9d
Merge pull request #13262 from ptibogxiv/patch-312 
FIX doc
 2020-03-03 22:53:51 +01:00
Laurent Destailleur
c3137142fe
Merge pull request #13252 from aspangaro/12.0_a20 
FIX: Nowrap on amount
 2020-03-03 21:44:54 +01:00
ptibogxiv
a71356f0ed
FIX doc 2020-03-03 13:41:19 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
Alexandre SPANGARO
aeb3f70df7 FIX: Nowrap on amount 2020-03-03 07:26:51 +01:00
Laurent Destailleur
46bf65704a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-02 21:59:56 +01:00
Laurent Destailleur
87fe2e691b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
 2020-03-02 21:59:34 +01:00
Laurent Destailleur
c9d7ea8998
Merge pull request #13241 from ptibogxiv/patch-309 
NEW: api invoice get by ref
 2020-03-02 21:39:17 +01:00
Laurent Destailleur
c8b51066e5 NEW Add due date in feature "Export accounting documents" 2020-03-02 16:00:07 +01:00
ptibogxiv
844775501d
Update api_invoices.class.php 2020-03-01 18:46:12 +01:00
ptibogxiv
de30410adc
Update api_invoices.class.php 2020-03-01 18:43:20 +01:00
stickler-ci
b074c689a6 Fixing style errors. 2020-03-01 17:35:12 +00:00
ptibogxiv
6ee8fa4e8a
NEW: api invoice get by ref 2020-03-01 18:33:13 +01:00
Alexandre SPANGARO
da99c89c26 FIX: typo on ckeck method 2020-03-01 05:21:51 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16 
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
 2020-02-29 13:02:43 +01:00
Laurent Destailleur
f0d458682d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-29 00:15:17 +01:00
Laurent Destailleur
f5a07dfb7e Add status into popup 2020-02-28 18:57:17 +01:00
Laurent Destailleur
87b3cf9765 FIX Bad link to template invoices 2020-02-28 12:01:43 +01:00
Laurent Destailleur
a3e56994b6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/admin/company.php
	htdocs/compta/tva/document.php
	htdocs/core/lib/files.lib.php
	htdocs/main.inc.php
 2020-02-27 18:35:32 +01:00
Marc de Lima Lucio
5d1f91f8ac FIX: muticurrency columns: remove useless column totals that mix currencies together 2020-02-27 17:37:36 +01:00
Marc de Lima Lucio
6d728f12ba NEW: invoice list: enable multicurrency columns 2020-02-27 14:10:00 +01:00
Alexandre SPANGARO
86d9622360 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 10:44:04 +01:00
Laurent Destailleur
9bc5eb44ca FIX #13182 2020-02-26 20:25:26 +01:00
Laurent Destailleur
0646b1a7a9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
 2020-02-26 17:04:14 +01:00
Laurent Destailleur
ef9fe73d96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/index.php
 2020-02-26 17:02:23 +01:00
Laurent Destailleur
921dacf695 Fix remove $_POST 2020-02-26 16:58:45 +01:00
Laurent Destailleur
114e41108d FIX sort link 2020-02-26 06:43:58 +01:00
Laurent Destailleur
c38e88ca46 FIX Bad sort link in accounting report 2020-02-26 06:43:52 +01:00
Laurent Destailleur
4831d22354 FIX sort link 2020-02-26 06:43:21 +01:00
Laurent Destailleur
6cf6719cfb FIX Bad sort link in accounting report 2020-02-26 06:39:02 +01:00
ATM john
4865e34cc2 fix missing visibility 2020-02-25 23:02:13 +01:00
Laurent Destailleur
a18fda6b3d Fix data on popup 2020-02-25 19:59:53 +01:00
Laurent Destailleur
d172a95dfe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-25 14:37:04 +01:00
Laurent Destailleur
457d0668c8 Look and feel v12 2020-02-24 05:23:34 +01:00
Laurent Destailleur
6366881f91 FIX #13175 2020-02-24 00:41:25 +01:00
ATM john
13790422dc Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-02-24 00:18:37 +01:00
Laurent Destailleur
f931b92d36 Merge branch 'new-takepos-batch-decrement' of 
https://github.com/OPEN-DSI/dolibarr into develop

# Conflicts:
#	htdocs/langs/en_US/errors.lang
 2020-02-23 22:49:03 +01:00
Laurent Destailleur
189c0d675b Fix memory report. Xdebug no more required. Try = null instead of unset. 2020-02-23 22:05:59 +01:00
Laurent Destailleur
0d474b2ec9 CSS 2020-02-22 14:20:42 +01:00
Laurent Destailleur
1d34ef213c Fix error management 2020-02-22 12:19:46 +01:00
ATM john
4117aa56a2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-02-22 11:19:49 +01:00
Frédéric FRANCE
8d507c4f32 fix workflow with multicurrency 2020-02-21 18:12:48 +01:00
Laurent Destailleur
c0098188af
Merge pull request #13154 from frederic34/patch-7 
fix workflow with multicurrency
 2020-02-21 18:12:27 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
89b7c8dfd6 NEW Can select which element to export in export accounting documents. 2020-02-21 14:20:05 +01:00
VESSILLER
ec19b2feef FIX phpcs nestling too high level 2020-02-21 12:00:16 +01:00
VESSILLER
71c9b94b22 NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation 2020-02-21 11:08:34 +01:00
Frédéric FRANCE
3df3a2560c
fix workflow with multicurrency 2020-02-20 15:11:31 +01:00
Laurent Destailleur
52c7f908a0 Doxygen 2020-02-20 14:02:27 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
e73d83767c Fix phpcs 2020-02-20 12:35:48 +01:00
Laurent Destailleur
7796724d63
Update list.php 2020-02-20 01:07:41 +01:00
Laurent Destailleur
960302c012
Merge branch 'develop' into patch-35 2020-02-20 01:07:08 +01:00
Laurent Destailleur
895503d2eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/CMailFile.class.php
 2020-02-20 00:21:25 +01:00
Laurent Destailleur
44c2909696 FIX Multicompany compatibility 2020-02-19 16:08:33 +01:00
Laurent Destailleur
3fafbb372b Remove call of $mc->dao than hangs. Replaced with $mc use. 2020-02-19 15:51:27 +01:00
Laurent Destailleur
1dd5ba093d Prepare PHP v8 - mktime() and gmmktime() are no more allowed 2020-02-19 12:11:16 +01:00
stickler-ci
028566616d Fixing style errors. 2020-02-19 11:07:42 +00:00
John Botella
6acf10c0d4 extend retained warranty to be available for all invoices 2020-02-19 11:54:55 +01:00
Pierre Ardoin
bebc37abe3
Update list.php 2020-02-19 08:54:10 +01:00
Pierre Ardoin
34d7fb887f
Show project Ref support if enable 
Add search and Project Ref column in the list, only if project module is enable.
 2020-02-19 08:50:49 +01:00
Laurent Destailleur
d0d352be1a FIX #13118 2020-02-19 03:37:28 +01:00
Laurent Destailleur
43b173ef76 FIX #13131 2020-02-19 01:23:54 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
35ada37d4d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/filefunc.inc.php
 2020-02-14 19:14:26 +01:00
Laurent Destailleur
58ad62aa7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-14 19:12:11 +01:00
Laurent Destailleur
bb895cb1d8 FIX ref_client not visible in tooltip. 2020-02-13 18:00:59 +01:00
Laurent Destailleur
c196342fd8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-13 15:44:06 +01:00
Laurent Destailleur
ec30938a07 Fix phpcs 2020-02-13 15:43:53 +01:00
Laurent Destailleur
306b8d190f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 15:42:54 +01:00
Laurent Destailleur
c6c941e09a Fix phpcs 2020-02-13 15:42:41 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 11:36:05 +00:00
Marc de Lima Lucio
fa78af1996 Merge branch 'FIX_8.0_situation_excess_paid' of github.com:ATM-Marc/dolibarr into 11.0 2020-02-13 12:18:16 +01:00
Laurent Destailleur
9e165a782f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 11:58:23 +01:00
Laurent Destailleur
e511deb8e7 FIX #13096 2020-02-13 11:39:08 +01:00
Laurent Destailleur
700e01d661 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-02-12 22:50:56 +01:00
Laurent Destailleur
75774ec6c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-12 20:30:30 +01:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
Marc de Lima Lucio
b1b00450a9 FIX: situation invoice: bad amount for previous payments because of local variable overwriting a more global one 2020-02-12 12:10:48 +01:00
Marc de Lima Lucio
de8660fb55 FIX: situation invoice: allow excess paid to be converted to discount 2020-02-12 12:09:03 +01:00
stickler-ci
27dd9aec9f Fixing style errors. 2020-02-11 16:12:48 +00:00
John Botella
02f268ea4e FIX - hasDelay for retained warranty 2020-02-11 16:54:27 +01:00
stickler-ci
416cb3016d Fixing style errors. 2020-02-11 13:15:23 +00:00
oscim
8b67793409
report and apply GETPOST method 
report and apply GETPOST method  for $dateech, $dateperiod, $label
 2020-02-11 14:13:08 +01:00
Laurent Destailleur
f70dd8ec06 Clean code. Load thirdparty for correct lang before generating doc 2020-02-10 00:22:53 +01:00
Laurent Destailleur
5f507b2df5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/tva/card.php
 2020-02-08 16:01:41 +01:00
Laurent Destailleur
716f765ce1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
 2020-02-08 16:00:06 +01:00
Laurent Destailleur
1a167aa5b4 Update card.php 
Conflicts:
	htdocs/compta/tva/card.php
 2020-02-08 15:12:55 +01:00
Laurent Destailleur
10790420ba
Merge pull request #13051 from oscim/patch-19 
report and apply  GETPOST method for $datev and $datep
 2020-02-08 15:07:18 +01:00
Laurent Destailleur
544e05a7dd
Update card.php 2020-02-08 15:06:45 +01:00
Laurent Destailleur
9f9002d6a6 Update field definition 2020-02-07 16:05:04 +01:00
Laurent Destailleur
fe7b79c83c Fix definition of objects 2020-02-07 15:51:14 +01:00
atm-lena
ecea726323 FIX CA by prod list filter 2020-02-07 15:01:37 +01:00
oscim
e408ea463c
report and apply GETPOST method for $datev and $datep 
fix for usage GETPOST() for input  $datev and $datep
And report definition $datev and $datep in top ection file for support GET params for action create
 2020-02-07 09:31:58 +01:00
Laurent Destailleur
9c73bb1aef NEW Can create an deposit from order using a percentage of qty. 2020-02-06 14:15:41 +01:00
Laurent Destailleur
4f3cc87077 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:00 +01:00
Laurent Destailleur
f3e27695e2 FIX Avoid deletion of bank record if in accounting 2020-02-05 16:35:50 +01:00
Laurent Destailleur
44ed5980f5 FIX Avoid deletion of bank record if in accounting 2020-02-05 16:35:09 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
af7a5b510d Fix phpcs 2020-02-04 14:47:30 +01:00
Laurent Destailleur
37617bbce8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 03:48:27 +01:00
Laurent Destailleur
a30da7860f FIX #12892 2020-02-03 03:32:31 +01:00
Laurent Destailleur
4765198af2 Clean code from using deprecated field amount 2020-02-02 19:03:37 +01:00
Laurent Destailleur
d827e3289a Removed no more used field "amount" in llx_facture 2020-01-31 15:12:17 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Michael Jeanmotte
f1f83656f1 Feature Request: Dolibarr API - [GET] /bankaccounts/{id}/lines : add sqlfilters #11259 2020-01-29 22:54:35 +01:00
Laurent Destailleur
e796a2eda9 Add fields array on common objects 2020-01-29 22:38:14 +01:00
Laurent Destailleur
1e879126cd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-01-29 19:28:06 +01:00
Laurent Destailleur
60f772d285 FIX Pending amount to pay must be zero if invoice close for anticipated 
payment.
 2020-01-29 17:56:09 +01:00
oscim
d224c711cf Update result.php 
fix error for display detail of account 6xxx. this account is < 0, but is not null
 2020-01-29 11:07:30 +01:00
oscim
862da5b646
Update result.php 
fix error for display detail of account 6xxx. this account is < 0, but is not null
 2020-01-29 08:08:15 +01:00
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
Laurent Destailleur
d6bdbccf4f Fix link 2020-01-19 19:33:57 +01:00
Pierre Ardoin
e4eb8883fe
Fix double display of create credit note button 
Before: Display of the "Create credit note" button twice for standard invoices when situation invoices are activated.
After: Displays a single button "Create a credit note"
 2020-01-19 19:10:10 +01:00
Laurent Destailleur
8c8d492a48 FIX Protection to avoid blocking situation with negative lines 2020-01-19 15:19:07 +01:00
Laurent Destailleur
6fd717539d
Merge pull request #12887 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2020-01-18 20:21:29 +01:00
Laurent Destailleur
24d439845b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-18 20:20:25 +01:00
Laurent Destailleur
178dd518cf
Merge branch 'develop' into scrutinizer-patch-5 2020-01-18 19:36:36 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-18 15:17:07 +00:00
Laurent Destailleur
73d56358e1 Fix bad param 2020-01-18 16:13:10 +01:00
Laurent Destailleur
82deccea08 Fix bad link 2020-01-17 14:41:42 +01:00
Laurent Destailleur
fe6bcd8a31 Fix missing value in popup 2020-01-17 14:32:22 +01:00
Laurent Destailleur
c556f60c89 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-16 18:13:35 +01:00
Laurent Destailleur
76e7c147b3 Look and feel v11 2020-01-16 18:03:57 +01:00
Laurent Destailleur
849c78f4cd Doc 2020-01-16 10:12:39 +01:00
Laurent Destailleur
ad7278e6a5 FIX Label of DEPOSIT on screen 
Fix look and feel v11
 2020-01-16 02:48:24 +01:00
Laurent Destailleur
76aedc9264
Merge pull request #12365 from aspangaro/11.0_a2 
NEW Invoice list - Add date start & date end
 2020-01-15 20:50:20 +01:00
Laurent Destailleur
4e4a810484
Merge pull request #12368 from aspangaro/11.0_a5 
NEW Various payment list - Add search date start & date end & subledger account
 2020-01-15 17:51:59 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
 2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
 2020-01-10 14:25:26 +01:00
Laurent Destailleur
9ebdd82edb Fix We must refuse to delete a various payment if payment was dispatched 
in accountancy.
 2020-01-10 02:43:24 +01:00
Laurent Destailleur
675ce3b32f Fix sql error on update of subledger account on a various payment 
Fix warning message that was not accurate
 2020-01-10 02:20:08 +01:00
atm-arnaud
ae4554af65 FIX drafts are now implemented for stats 2020-01-08 11:27:52 +01:00
Laurent Destailleur
ccceaac358 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-06 17:20:54 +01:00
Laurent Destailleur
ec2ea612ae Fix GETPOST 2020-01-06 17:19:49 +01:00
Laurent Destailleur
57bbac2015 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-06 14:09:46 +01:00
Laurent Destailleur
58ff3e563d Fix link a href 2020-01-06 02:21:42 +01:00
Laurent Destailleur
6dcba0f053 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-04 14:27:55 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Laurent Destailleur
b9e0f8999f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2020-01-04 14:03:21 +01:00
Alexandre SPANGARO
f14aaf5e50 FIX Some problems on conciliation with others modules 2020-01-03 16:35:02 +01:00
Laurent Destailleur
2c20b25a29 Suggest another value than "bad customer" to close an invoice paid 2020-01-02 18:02:53 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/invoice.php
 2020-01-01 22:37:13 +01:00
Laurent Destailleur
2e8fd25299 FIX Local taxes was not correctly supported in TakePOS. 2020-01-01 21:54:47 +01:00
Laurent Destailleur
b50cb2a65d Fix solution to solve a blocking situation (credit note both refunded 
and consumed)
 2020-01-01 19:04:14 +01:00
Laurent Destailleur
eae0800021 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-01 11:24:10 +01:00
Laurent Destailleur
f11a119ab0 Clean dead code 2019-12-31 16:50:21 +01:00
Laurent Destailleur
175894db26 FIX Status of direct debit payment after setting to paid. 2019-12-31 14:48:52 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
8202a67e4e Fix look and feel v11 2019-12-25 23:15:56 +01:00
Alexandre SPANGARO
44400b7866 FIX : Some issues on salary payment 2019-12-24 07:22:25 +01:00
Alexandre SPANGARO
ab0f77b467 Merge remote-tracking branch 'upstream/develop' into 11.0_a5 2019-12-23 21:15:17 +01:00
Alexandre SPANGARO
384651db46 Merge remote-tracking branch 'upstream/develop' into 11.0_a2 2019-12-23 21:01:17 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
VESSILLER
c39e45b81a FIX set due date in object in create invoice 2019-12-23 10:57:51 +01:00
Laurent Destailleur
daae053e39 Debug CashFence feature 2019-12-22 20:02:18 +01:00
Laurent Destailleur
3036ff637f Fix bad url 2019-12-22 19:49:39 +01:00
Laurent Destailleur
3ae5901a64 Fix look and feel v11 2019-12-22 19:46:36 +01:00
Laurent Destailleur
dd9f25b13a CSS 2019-12-22 16:33:15 +01:00
Laurent Destailleur
39737c7c4b Fix opacity on text with a href links inside 
Fix var not defined
 2019-12-22 13:19:14 +01:00
Laurent Destailleur
d9a1e1b348 Fix several non dolibarr behaviour on input of salary payments 2019-12-19 10:01:11 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
db5672ae90 Fix creation/update of expense reports 
Fix export of accounting documents
 2019-12-18 23:07:26 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Laurent Destailleur
138215fc3f Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non 
european users.
 2019-12-16 22:30:16 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
49a8b4544e Fix look and feel v11 2019-12-15 19:32:37 +01:00
Laurent Destailleur
9685b56375 Fix warning 2019-12-15 15:03:22 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
8fbaae3fef
Merge pull request #12694 from frederic34/patch-8 
doxygen
 2019-12-14 13:43:47 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
Regis Houssin
a527e72124 FIX #12688 2019-12-12 16:35:07 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
9357bfd98e
doxygen 2019-12-12 08:17:14 +01:00
Frédéric FRANCE
269e53583d
doxygen 2019-12-11 23:46:12 +01:00
Frédéric FRANCE
66805a502a
doxygen 2019-12-11 22:53:57 +01:00
Frédéric FRANCE
c98ab917dd
doxygen 2019-12-11 20:33:58 +01:00
Laurent Destailleur
5454380834 CSS 2019-12-11 19:14:41 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
738526e77e Fix br 2019-12-10 14:04:50 +01:00
Laurent Destailleur
fe44d3a4fa FIX #12674 2019-12-10 14:02:03 +01:00
Laurent Destailleur
2d97c0bb79 Try better fix for #12674 2019-12-10 13:55:45 +01:00
Laurent Destailleur
a77dc75bd4
Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template 2019-12-09 16:05:23 +01:00
Laurent Destailleur
2fd6c690c0
Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card 
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
 2019-12-09 15:59:55 +01:00
Laurent Destailleur
f28e4c14e8 FIX #12644 2019-12-09 13:40:26 +01:00
Laurent Destailleur
0a3b2987d1
Merge pull request #12657 from frederic34/patch-19 
doxygen
 2019-12-09 10:47:16 +01:00
Laurent Destailleur
eb0d20b77e Fix label of country 
Fix div empty
 2019-12-09 09:16:59 +01:00
Frédéric FRANCE
c05ba624ce
Update deplacement.class.php 2019-12-08 22:46:22 +01:00
Frédéric FRANCE
3db84df60e
Update card.php 2019-12-08 22:45:10 +01:00
Frédéric FRANCE
6c5629b5a5
Update deplacement.class.php 2019-12-08 22:39:33 +01:00
Frédéric FRANCE
49f22facef
doxygen 2019-12-08 22:37:19 +01:00
Florian Mortgat
6227d14cf3 NEW 10.0: link to template of origin in bill cards for bills created from a template 2019-12-06 13:48:24 +01:00
Scrutinizer Auto-Fixer
4debd71281 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-06 08:26:49 +00:00
Laurent Destailleur
93d66d8213 Debug v11 2019-12-06 08:50:26 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-05 21:47:42 +01:00
Florian Mortgat
3f6715a377 FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list 2019-12-05 15:34:41 +01:00
Laurent Destailleur
5f148be56f Fix responsive 2019-12-04 16:43:56 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
Laurent Destailleur
6f7343b14f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-02 11:01:26 +01:00
Laurent Destailleur
6d81bc77cb Fix look and feel v11 2019-12-02 11:00:09 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Laurent Destailleur
3eec2430eb
Merge pull request #12585 from atm-john/develop_factoring_token_usage 
Factoring token usage
 2019-12-01 11:37:30 +01:00
Laurent Destailleur
790fdc881c # WARNING: head commit changed in the meantime 
Restore file for travis
 2019-12-01 10:50:56 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Laurent Destailleur
1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-12-01 00:58:01 +01:00
Laurent Destailleur
199b0c11af
Merge pull request #12572 from atm-maxime/fix_deposit 
Fix deposit line was not translated in deposit invoice
 2019-12-01 00:44:17 +01:00
Maxime Kohlhaas
3c639772d9 Fix #11228 : VAT dates regarding fiscal year 2019-11-30 17:16:16 +01:00
Maxime Kohlhaas
558669dd88 Fix #6497 : deposit lines were not translated 2019-11-30 16:14:16 +01:00
Laurent Destailleur
6944b67b1e
Merge pull request #12548 from frederic34/patch-8 
functions return void
 2019-11-30 01:25:04 +01:00
Frédéric FRANCE
6d8c59991d
doxygen 2019-11-28 23:21:42 +01:00
Frédéric FRANCE
06839e9a7f
functions return void 2019-11-28 22:34:53 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-28 11:36:20 +00:00
Laurent Destailleur
8430ec4f50
Merge pull request #12534 from aspangaro/11.0_a8 
Look & Feel v11
 2019-11-28 12:18:39 +01:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-27 22:54:05 +01:00
Alexandre SPANGARO
0f6de0049c Fix 2019-11-26 21:17:22 +01:00
Alexandre SPANGARO
659e3aca8e Look & field v11 2019-11-26 21:14:44 +01:00
Alexandre SPANGARO
d910b05a38 Look & Feel v11 2019-11-26 20:28:24 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
Frédéric FRANCE
f3f308fc1b
Update graph.php 2019-11-26 00:11:02 +01:00
Scrutinizer Auto-Fixer
e36ee63ab6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-22 13:16:38 +00:00
Laurent Destailleur
f9092b1b8e Fix responsive 2019-11-20 13:22:40 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-19 23:26:00 +01:00
Laurent Destailleur
fb70893229 Fix missing class reposition 2019-11-19 21:29:49 +01:00
Laurent Destailleur
07c01a821e FIx #12466 manually (conflict pb) 2019-11-19 19:43:02 +01:00
Laurent Destailleur
5d7a1f1265 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/en_US/stocks.lang
 2019-11-19 19:02:14 +01:00
Laurent Destailleur
2f3b4d239b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-19 18:56:12 +01:00
Laurent Destailleur
5b6f0cb101 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2019-11-18 21:19:10 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Alexandre SPANGARO
1e2fd1f25a Merge remote-tracking branch 'upstream/develop' into 11.0_a5 2019-11-17 21:55:25 +01:00
Scrutinizer Auto-Fixer
eba082320c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-16 22:25:24 +00:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Laurent Destailleur
8db4eff108
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8 
Scrutinizer Auto-Fixes
 2019-11-14 12:10:44 +01:00
Scrutinizer Auto-Fixer
f197196719 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:46 +00:00
gauthier
a5635825f3 FIX : wrong invoice id for fetchObjetctLinked 2019-11-14 12:09:32 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Frédéric FRANCE
446c66da62
use class CONST 2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
c66bce7ec6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:31:18 +00:00
Laurent Destailleur
4340f85e3c Add warning 2019-11-13 01:22:13 +01:00
Laurent Destailleur
453ffad9e8 Look and feel v11 2019-11-12 18:01:16 +01:00
Laurent Destailleur
2a67dd0f66 Look and feel v11 2019-11-12 17:43:27 +01:00
Laurent Destailleur
e79ac7081a Look and feel v11 2019-11-12 17:37:05 +01:00
Laurent Destailleur
3430a88c72 Fix $conf not defined 2019-11-12 10:13:22 +01:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Laurent Destailleur
2ccef4e469 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2019-11-11 19:10:35 +01:00
stickler-ci
fae5d56d34 Fixing style errors. 2019-11-10 10:04:11 +00:00
Philippe GRAND
b0d68a6de1 add some comment 2019-11-10 11:05:30 +01:00
stickler-ci
4dda9edeb6 Fixing style errors. 2019-11-10 10:01:28 +00:00
Philippe GRAND
f960191671 add some comment 2019-11-10 11:02:44 +01:00
Alexandre SPANGARO
86b90b115f NEW Invoice list - Add date start & date end 2019-11-09 05:20:13 +01:00
Laurent Destailleur
89ecd6a72a
Merge pull request #12389 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-08 15:53:57 +01:00
Laurent Destailleur
4fce0d3e7a Fix not transversable 2019-11-08 15:52:57 +01:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 14:51:54 +00:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 09:53:31 +00:00
Laurent Destailleur
ba1f4f0ac6 Fix look and feel v11 2019-11-07 16:40:59 +01:00
Laurent Destailleur
c0b8684475
Merge pull request #12341 from inoveaconseil/bankStatementDocument 
NEW add upload for account statement
 2019-11-07 15:06:47 +01:00
Laurent Destailleur
c7e261a973 FIX #11907 2019-11-07 14:40:26 +01:00
Laurent Destailleur
5a4a421a8e FIX #12372 2019-11-07 13:07:40 +01:00
Laurent Destailleur
cd5c359b83 Fix regression 2019-11-07 12:53:26 +01:00
Laurent Destailleur
4c44f3c109
Merge pull request #12366 from aspangaro/11.0_a3 
NEW VAT list - Add date start & date end
 2019-11-07 11:53:16 +01:00
Alexandre SPANGARO
b85dc0c5e5 NEW Various payment list - Add search date start & date end & subledger_account 2019-11-07 09:19:48 +01:00
Alexandre SPANGARO
fd45eeab83 NEW VAT list - Add date start & date end 2019-11-07 08:34:06 +01:00
Alexandre SPANGARO
e60b7a67fa NEW Invoice list - Add date start & date end 2019-11-07 06:35:58 +01:00
Nicolas
f18bca7687 Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument 2019-11-06 20:51:17 +01:00
Nicolas
4143988614 NEW Add upload document on account statement 2019-11-06 20:50:02 +01:00
Inovea Conseil
fed6ed8760 Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument 2019-11-06 20:48:24 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
17d5c385ff FIX #12320 It is clearer that you can't change thirdparty when creating 
invoice from template with a recurring rule.
 2019-11-05 15:46:48 +01:00
stickler-ci
f537ae60b6 Fixing style errors. 2019-11-05 12:52:58 +00:00
Nicolas
991e1b2747 NEW Add upload document on account statement 2019-11-05 13:51:52 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Frédéric FRANCE
3a729f9e7b
fix missing newtoken in form 2019-11-04 22:45:20 +01:00
Laurent Destailleur
a8b1a75ea3
Merge pull request #12325 from frederic34/patch-6 
fix indent in card-rec.php
 2019-11-04 21:11:34 +01:00
Laurent Destailleur
e61f28ed17
Merge pull request #12318 from grandoc/new_branch_04_11_2019 
fix translation
 2019-11-04 20:50:58 +01:00
Frédéric FRANCE
ac783b303d
Update card-rec.php 2019-11-04 20:47:25 +01:00
Laurent Destailleur
e60fff39d9 Fix phpcs 2019-11-04 20:36:55 +01:00
Laurent Destailleur
ec8bd6327d Fix css 2019-11-04 18:53:46 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
stickler-ci
4480d7dd88 Fixing style errors. 2019-11-04 14:09:43 +00:00
Philippe GRAND
2909f8141e fix translation 2019-11-04 15:08:43 +01:00
Laurent Destailleur
99a4781a42 Fix better support for multicurrency for template invoices 2019-11-03 18:58:26 +01:00
Laurent Destailleur
630a150b09 Fix multicurrency rate must be visible if currency differs only 2019-11-03 17:48:16 +01:00
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +01:00
Laurent Destailleur
89f1904793 Finish removing of ->attribute_label 2019-11-02 17:26:26 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
6348227698
Merge pull request #12275 from frederic34/patch-8 
css
 2019-11-02 13:31:18 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019 
add some comment
 2019-11-02 13:00:23 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019 2019-11-02 12:00:04 +01:00
Laurent Destailleur
68c971a2b5 All properties 'type_libelle' were renamed into 'type_label'. 2019-11-02 11:12:57 +01:00
Laurent Destailleur
82bda63920
Merge pull request #12296 from frederic34/patch-20 
Update index.php
 2019-11-02 10:09:55 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
2d9135b6ad Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/card.php
	htdocs/holiday/list.php
 2019-11-01 21:06:06 +01:00
Frédéric FRANCE
8b98df296f
Update info.php 2019-11-01 17:36:11 +01:00
Frédéric FRANCE
6dd8e7152c
Update index.php 2019-11-01 17:31:34 +01:00
Frédéric FRANCE
38b86d4bde
Update payments.php 2019-11-01 17:30:49 +01:00
Frédéric FRANCE
61873aa1a8
Update list.php 2019-11-01 17:29:21 +01:00
Frédéric FRANCE
5314ff70f5
Update index.php 
in class ref and rowid are the same, lib is deprecated and is label
 2019-11-01 17:26:53 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Philippe Grand
9fad5dc8fc
Update chargesociales.class.php 2019-11-01 11:16:47 +01:00
Philippe Grand
f568241a81
Update cashcontrol.class.php 2019-11-01 11:16:20 +01:00
stickler-ci
0c6938aa2a Fixing style errors. 2019-11-01 09:44:29 +00:00
Philippe GRAND
4fe3e49502 add some comment 2019-11-01 10:42:14 +01:00
Laurent Destailleur
a0e377feb3 Look and feel v11 2019-10-31 22:11:26 +01:00
Laurent Destailleur
a1700e71be Fix phpcs 2019-10-31 21:18:38 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
607c38775d Use popup 2019-10-31 14:57:05 +01:00
Laurent Destailleur
360b3a9550 NEW Ask the new label and new dates in confirm popup when cloning tax 2019-10-31 14:06:26 +01:00
Frédéric FRANCE
f202424432
css 2019-10-30 18:52:54 +01:00
Laurent Destailleur
923ab59e4e
Merge pull request #12219 from frederic34/patch-7 
css
 2019-10-30 03:13:14 +01:00
Laurent Destailleur
8849cd9897
Update index.php 2019-10-30 02:19:32 +01:00
Alexandre SPANGARO
db86dff7d1 Fix sign for VAT repaid in report 2019-10-29 17:10:10 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory 2019-10-26 18:13:20 +02:00
Frédéric FRANCE
79825e2193
start clean indent in compta directory 2019-10-26 14:42:25 +02:00
Frédéric FRANCE
99b338b468
Update index.php 2019-10-24 23:09:58 +02:00
Laurent Destailleur
b4eb14ee44 Use dolGetStatus 2019-10-24 16:43:23 +02:00
Laurent Destailleur
9a386da7f5 NEW Can crop/resize image attached on a bank record 2019-10-23 16:07:09 +02:00
Laurent Destailleur
31ad147e0e Look and feel v11 2019-10-23 15:17:01 +02:00
Laurent Destailleur
02f559db5f Use GETPOST 2019-10-23 15:07:21 +02:00
Laurent Destailleur
564f96c092 Fix scrutinizer warnings 2019-10-23 14:59:02 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Laurent Destailleur
9be9f912af
Merge pull request #12192 from Ahuahuachi/develop 
Translate documentation and minor code improvement
 2019-10-22 12:32:40 +02:00
Alfredo Altamirano
f2e5a23547 Declaration of $soc should not be conditional 2019-10-20 13:47:39 -05:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
Frédéric FRANCE
a16b7bcda6
cut long lines 2019-10-19 19:16:28 +02:00
Laurent Destailleur
78ac543dee Fix link to list 2019-10-18 20:01:47 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
 2019-10-17 17:48:42 +02:00
Laurent Destailleur
f7782873a5 Look and feel v11 2019-10-17 15:58:24 +02:00
Laurent Destailleur
c58a006703 NEW Show POS application and terminal on invoice card. 2019-10-17 15:56:50 +02:00
Laurent Destailleur
5e12dcc6b1 Fix on FACTURE_ENABLE_NEGATIVE 2019-10-17 15:40:02 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
b9ec45fd49 Clean code 2019-10-16 14:02:13 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
ebd8bc3645
Merge pull request #12107 from frederic34/patch-14 
Update list.php
 2019-10-14 20:57:01 +02:00
Laurent Destailleur
1f672221ec
Merge pull request #12106 from frederic34/patch-13 
avoid ErrorBadValueForParamNotAString if not configured
 2019-10-14 20:55:06 +02:00
Laurent Destailleur
5d02763288
Merge pull request #12129 from cyrilus/develop 
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
 2019-10-14 20:39:08 +02:00
Laurent Destailleur
dbdc62b028 Fix td 2019-10-14 18:41:46 +02:00
stickler-ci
4b7987374b Fixing style errors. 2019-10-14 14:46:04 +00:00
Laurent Destailleur
dba9450b01 css 2019-10-14 16:03:12 +02:00
Laurent Destailleur
28339920b3 Translation 2019-10-14 16:00:03 +02:00
Laurent Destailleur
323f31d832 Trans frequency 2019-10-13 20:54:00 +02:00
Laurent Destailleur
f91b98d326 Add frequency in template invoice popup 2019-10-13 20:50:03 +02:00
Frédéric FRANCE
b424fc6e27
Update list.php 2019-10-12 18:57:08 +02:00
Frédéric FRANCE
cef935468d
Update list.php 2019-10-12 18:40:39 +02:00
Laurent Destailleur
bcc41c2a33 NEW Can filter on description on bank account transaction lists. 2019-10-12 13:19:10 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Laurent Destailleur
78bfc8997d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:14:29 +02:00
Laurent Destailleur
d052e4f323 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:12:01 +02:00
Laurent Destailleur
777c297353 FIX #12054 2019-10-11 15:42:27 +02:00
ro@t.com
2149b155d1 ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning 2019-10-10 15:57:26 +02:00
Laurent Destailleur
b34cbfad74 Rename const 2019-10-10 15:23:45 +02:00
Laurent Destailleur
015d51c169 NEW Add column of module source and POS terminal in invoice list. 2019-10-10 15:10:41 +02:00
Laurent Destailleur
b6c600c171 css 2019-10-10 11:44:03 +02:00
Frédéric FRANCE
0c8331b6d7
doxygen 2019-10-09 18:47:25 +02:00
Laurent Destailleur
dcc4fa6a64
Merge branch 'develop' into patch-255 2019-10-08 19:37:42 +02:00
Laurent Destailleur
5970ea5b79
Update releve.php 2019-10-08 15:48:29 +02:00
Laurent Destailleur
d6bf0fa483
Update releve.php 2019-10-08 15:47:47 +02:00