Commit Graph

104465 Commits

Author SHA1 Message Date
Laurent Destailleur
e8a2fc33c3 Fix visiblity of dictionnary for MAIN_USE_EXPENSE_IK 2021-11-07 12:47:03 +01:00
Laurent Destailleur
09d9d1ac42 Add missing unique key 2021-11-07 12:38:44 +01:00
Laurent Destailleur
11bb7428ce Clean code 2021-11-07 12:34:08 +01:00
Laurent Destailleur
713db0e613 Removed function pdf_getTotalQty (duplicate with pdf_getlineqty) 2021-11-07 12:26:44 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
2021-11-06 21:11:05 +01:00
Laurent Destailleur
7e68f9e013 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
2021-11-06 21:04:17 +01:00
Laurent Destailleur
ddb68a3ae8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-06 20:40:34 +01:00
Laurent Destailleur
fc70adb2e7 Fix ref suffix for patnership into PSHIP 2021-11-06 20:40:26 +01:00
Laurent Destailleur
edbcf78495 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-06 20:39:05 +01:00
Laurent Destailleur
0bc5ec8c78 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-06 20:38:29 +01:00
Laurent Destailleur
65105a3e05 Better log 2021-11-06 19:27:50 +01:00
Laurent Destailleur
77864f2c2c NEW Can set value for EHLO smtp command in MAIL_SMTP_USE_FROM_FOR_HELO 2021-11-06 19:11:47 +01:00
Laurent Destailleur
257fe444af
Merge pull request #19181 from frederic34/commandelist
fix warnings in commande list
2021-11-05 14:32:17 +01:00
Laurent Destailleur
9f3fec40cb
Merge pull request #19262 from atm-maxime/new_element_tag_table
New : prepare future element_tag table
2021-11-05 14:31:37 +01:00
Laurent Destailleur
b56828219c
Merge pull request #19277 from javieralapps4up/develop
Update card.php ($usergroup->members is not necessary and wastes resources)
2021-11-05 14:29:46 +01:00
Laurent Destailleur
c7000037e5
Merge pull request #19278 from frederic34/patch-8
remove old field
2021-11-05 14:25:34 +01:00
Laurent Destailleur
44b129f754
Merge pull request #19286 from BadPixxel/patch-7
FIX: Status propagation from Parent Product
2021-11-05 14:25:02 +01:00
Laurent Destailleur
897b00faf0 Clean code 2021-11-05 14:23:19 +01:00
Laurent Destailleur
e8a550cb21
Merge pull request #19273 from frederic34/patch-1
fix warning (bad const)
2021-11-05 14:02:41 +01:00
Laurent Destailleur
aaa8849dff
Merge pull request #19274 from frederic34/patch-4
fix change sql
2021-11-05 14:01:51 +01:00
Laurent Destailleur
b9d5f77937
Merge pull request #19276 from frederic34/patch-7
fix warnings
2021-11-05 14:01:14 +01:00
Laurent Destailleur
c0c894d6f4
Merge pull request #19288 from OPEN-DSI/fix_00018
FIX second approval back in stable feature as is the setting for minimum amount (last part from PR#14286)
2021-11-05 14:00:41 +01:00
Laurent Destailleur
2b6d296e63 Rename var 2021-11-05 13:58:11 +01:00
Laurent Destailleur
d32ecfe5aa
Merge pull request #19291 from OPEN-DSI/fix_00019
NEW: Can show Paid button if invoice or supplier invoice has no payments with global
2021-11-05 13:37:39 +01:00
Laurent Destailleur
e430fe5f94
Merge pull request #19302 from FHenry/dev_addhook_dolbanner
NEW: for developpers add hook for moreHTMLRef in dol_banner_tab
2021-11-05 13:28:39 +01:00
Laurent Destailleur
f8cc75ecf2
Merge pull request #19296 from daraelmin/daraelmin-stats-1
Add link year subscription list in subscription by year stats page
2021-11-05 13:19:05 +01:00
Laurent Destailleur
15bc4a7d6b
Update index.php 2021-11-05 13:18:37 +01:00
Laurent Destailleur
5cf9ae7162
Merge pull request #19299 from vincentjdc/credit-note-no-invoice
Handle case where credit note has no source invoice
2021-11-05 13:12:39 +01:00
Laurent Destailleur
bc7b035846
Update card.php 2021-11-05 13:11:54 +01:00
Laurent Destailleur
02200b9810
Update card.php 2021-11-05 13:10:44 +01:00
Laurent Destailleur
a0fffbae04
Merge pull request #19298 from daraelmin/daraelmin-stats-2
Fix Bad count of subscription by year
2021-11-05 13:06:17 +01:00
Laurent Destailleur
01b1ce5fb5
Merge pull request #19313 from cfoellmann/PR/fix-holiday-docpreview
fix DocumentPreview on holiday documents
2021-11-05 13:03:22 +01:00
Laurent Destailleur
19b9412c13 FIX #19305 2021-11-05 12:49:33 +01:00
Laurent Destailleur
58abcf7e5a
Merge pull request #19307 from fmarcet/develop
Qual: If hidden option BANK_CAN_RECONCILIATE_CASHACCOUNT is activated
2021-11-05 12:43:39 +01:00
Laurent Destailleur
23749b57ec
Merge pull request #19311 from atm-john/12.0_fix_missing_return_status_for_getrow
FIX : missing return status
2021-11-05 12:42:54 +01:00
Laurent Destailleur
3959d12a39
Update DoliDB.class.php 2021-11-05 12:42:42 +01:00
Laurent Destailleur
49e57c75fa
Merge pull request #19316 from vincentjdc/expensereport-option-to-require-file
NEW Adds `EXPENSEREPORT_FILE_IS_REQUIRED` global var to force user to join file for each line of an expense report
2021-11-05 12:40:25 +01:00
Vincent Dieltiens
4af8a4e9fd Add EXPENSEREPORT_FILE_IS_REQUIRED global var to force user to join a file for each line of an expense report 2021-11-05 12:11:54 +01:00
Christian Foellmann
58ae45a88b fix DocumentPreview on holiday documents 2021-11-04 13:58:38 +01:00
ATM john
dd8d4e9e98 Fix missing return status 2021-11-04 12:10:19 +01:00
Ferran Marcet
3f426abc29 Qual: If hidden option BANK_CAN_RECONCILIATE_CASHACCOUNT is activated, show Account Statements tab on Cash Accounts 2021-11-04 10:56:55 +01:00
Florian HENRY
054d98b942 fix ref 2021-11-03 16:31:35 +01:00
Florian HENRY
a4c4732d5d NEW: for developpers add hook for moreHTMLRef in dol_banner_tab 2021-11-03 16:18:03 +01:00
Vincent Dieltiens
a359c7a681 Handle case where credit note has no source invoice 2021-11-03 14:22:08 +01:00
daraelmin
d334fe1292
Fix Bad count of subscription by year
If
2021-11-03 13:12:33 +01:00
daraelmin
b02c89bd8b
Add link year subscription list in subscription by year stats page 2021-11-02 23:07:46 +01:00
kamel
d91c24233c NEW: Can show Paid button if invoice or supplier invoice has no payments with global INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS and SUPPLIER_INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS 2021-11-02 16:43:09 +01:00
kamel
82b7f0e9e4 FIX second approval back in stable feature as is the setting for minimum amount (last part from PR#14286) 2021-11-02 15:21:14 +01:00
stickler-ci
5c10cd5ba9 Fixing style errors. 2021-11-02 13:20:41 +00:00
BadPixxel
98929f2dba
FIX: Status propagation from Parent Product
toSell or toBuy Status propagation should be done only when parent is updated. 

Otherwise, any modification made on the parent will overwrite the specific configuration made at the child level.
2021-11-02 14:16:55 +01:00