Commit Graph

104596 Commits

Author SHA1 Message Date
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
Regis Houssin
3fb0e3c5ad NEW add html.formldap.class.php 2021-11-03 22:56:15 +01:00
stickler-ci
586005ff2e Fixing style errors. 2021-11-03 21:43:30 +00:00
daraelmin
f9db196512
Update subscription.php 2021-11-03 22:31:45 +01:00
daraelmin
0e91b32e99
Update subscription.php 2021-11-03 20:40:09 +01:00
daraelmin
973f408b6e
Fix default enddate subscription must be in futur 2021-11-03 20:35:57 +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
Benjamin Chantalat
49d955b794 Uniformization of the table code as the line above 2021-11-02 15:53:57 +01:00
Benjamin Chantalat
0c1d4c9d51 No need of escape htmltag thanks to GETPOST before 2021-11-02 15:48:12 +01:00
Benjamin Chantalat
126fbf9f63 Change date format to be equal to mass stock transfert 2021-11-02 15:46:04 +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
Anthony Berton
5bb6185e64 add_substitution 2021-11-02 12:37:39 +01:00
Frédéric FRANCE
d40e9bb304
remove old field
field skype has been removed
2021-11-01 13:52:06 +01:00
javieralapps4up
8bfb656228
Update card.php
Load $usergroup->members is not necessary and wastes resources
2021-11-01 13:47:52 +01:00
Frédéric FRANCE
d7c0d87aeb
Update mod_facture_fournisseur_tulip.php 2021-11-01 13:35:25 +01:00
Frédéric FRANCE
18918d4e9d
Update actions_addupdatedelete.inc.php 2021-11-01 13:34:13 +01:00
Frédéric FRANCE
55243dedb6
fix typo 2021-11-01 13:32:19 +01:00
Regis Houssin
c5e6893289 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
fix_add_ldap_hash_type_select

Conflicts:
	htdocs/core/class/ldap.class.php
2021-11-01 11:16:33 +01:00
Regis Houssin
772c3eb43a Works on ldap password hash type 2021-11-01 11:13:44 +01:00
Laurent Destailleur
960319fd8a dol_htmlentities is better for future than htmlentities 2021-11-01 10:33:54 +01:00
Maxime Kohlhaas
3508aa92d6 Fix : uk and index on element_tag table 2021-11-01 10:24:19 +01:00
Maxime Kohlhaas
8858b2ba55 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_element_tag_table 2021-11-01 10:06:42 +01:00
Frédéric FRANCE
b992deb084
fix warnings 2021-11-01 09:44:43 +01:00
Frédéric FRANCE
f99a11b876
Update evaluationdet.class.php 2021-11-01 09:28:51 +01:00
Frédéric FRANCE
aaadeb1b9d
fix change sql 2021-11-01 09:27:32 +01:00
Frédéric FRANCE
cb8e1ce8f0
fix warning 2021-11-01 09:20:22 +01:00
Laurent Destailleur
7d07da527d Debug v15 2021-11-01 03:30:22 +01:00
Laurent Destailleur
3e1fa44657 Fix phpdoc 2021-11-01 03:23:38 +01:00
Laurent Destailleur
2f7e246ab3 Merge 2021-11-01 03:18:12 +01:00
Laurent Destailleur
6acc8a6582 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/class/ldap.class.php
2021-11-01 03:17:51 +01:00
Laurent Destailleur
3e46d58129 FIX Type of field progression in ticket must be integer 2021-11-01 03:14:54 +01:00
Laurent Destailleur
7dcd98b9bb
Merge pull request #19234 from hregis/fix_see_ldap_connected_server
FIX show connected server if we have a primary and secondary ldap server
2021-11-01 02:46:28 +01:00
Laurent Destailleur
1b336456ce Code comment 2021-11-01 02:44:14 +01:00