lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,905 Commits 43 Branches 150 Tags 886 MiB
a9e48a6aac
Commit Graph

12085 Commits

Author SHA1 Message Date
BENKE Charlene
364799582a fix : allow cut&paste as real numeric value to excel 2022-04-29 17:24:55 +02:00
Laurent Destailleur
38c0264971 Show warning if not journal not defined 2022-04-29 17:15:42 +02:00
Laurent Destailleur
223db9bb76 Fix: Not SetEventMessages inside a CRUD class. 2022-04-29 14:32:47 +02:00
Laurent Destailleur
40d0c3b996 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/card.php
	htdocs/langs/en_US/admin.lang
 2022-04-28 19:23:13 +02:00
Laurent Destailleur
559694dd4f API doc 2022-04-28 19:05:23 +02:00
Laurent Destailleur
93815404a2 Fix phpcs 2022-04-28 18:46:52 +02:00
Florian HENRY
dd85c22927 remove combox search box 2022-04-27 08:50:58 +02:00
Alexandre SPANGARO
8d3c2e34f4 FIX Check field accountancy code customer is mandatory in mass action 2022-04-26 11:46:00 +02:00
Laurent Destailleur
8de9d63f7d FIX Numbering of sepa files 2022-04-26 00:35:20 +02:00
Laurent Destailleur
16c607f4d8 Fix responsive 2022-04-24 18:55:52 +02:00
Laurent Destailleur
307476786c Fix label of remain to pay on vendor invoices 
FIX tool to fix bank account not in main currency for vendor invoice
 2022-04-19 23:24:08 +02:00
Lenin Rivas
8caa45ee80
Show only code multicurrency in lists 2022-04-18 12:22:29 -05:00
Regis Houssin
cc9c49afc9 TODO ICS is not used with bank transfer 2022-04-15 16:40:41 +02:00
Regis Houssin
81f0aedc8f FIX SEPA ICS is not mandatory for bank transfer 2022-04-15 16:17:03 +02:00
lmarcouiller
1ccf209c47 Close #20653 : edit discount pourcentage 2022-04-15 14:31:44 +02:00
Florian HENRY
292df417fe NEW: Add column template invoice in invoice list 2022-04-15 11:32:53 +02:00
Laurent Destailleur
4e34649fc2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2022-04-14 16:10:23 +02:00
Laurent Destailleur
ae412d37ed Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 15:28:16 +02:00
Laurent Destailleur
6a7212a48d Fix sql error 2022-04-12 22:02:46 +02:00
Laurent Destailleur
1bfd9c695f
Update tva.class.php 2022-04-12 16:29:25 +02:00
stickler-ci
adda436dab Fixing style errors. 2022-04-12 12:45:05 +00:00
kevin
c51aff99af Add missing entity on adding new VAT 2022-04-12 14:38:17 +02:00
Laurent Destailleur
98c7139859 Fix regression on fetchObjectLinked when used in loop on a static object 2022-04-12 10:34:50 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 21:14:51 +02:00
Laurent Destailleur
c035ee6f2a Look and feel v16 2022-04-11 19:21:04 +02:00
Laurent Destailleur
1aecff854b Fix missing limit in redirect 2022-04-09 14:40:29 +02:00
Laurent Destailleur
68d11f2e89 Fix phpunit regression 2022-04-09 02:42:32 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +02:00
Laurent Destailleur
42f82486da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:59:19 +02:00
Laurent Destailleur
b8c8d2af93 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:56:42 +02:00
Laurent Destailleur
eecbc05bc3 Show amount into popup of payment 2022-04-09 00:06:02 +02:00
Laurent Destailleur
003bcd60fa FIX Add protection on bad input of payment on multicurrency invoices 2022-04-08 19:52:40 +02:00
Laurent Destailleur
0673a4826a FIX currency visible into tooltip 2022-04-08 17:13:41 +02:00
Laurent Destailleur
4ff8969bac
Merge pull request #19393 from atm-gauthier/NEW/addline_with_position_choice_develop 
New/addline with position choice develop
 2022-04-08 16:09:44 +02:00
Laurent Destailleur
099e7aaeb5
Merge pull request #20532 from OPEN-DSI/fix_add_line_when_create_invoice 
FIX - Fix the adding of lines in the create invoice functions
 2022-04-08 15:33:35 +02:00
Laurent Destailleur
6169f76a34 Add log for debug. Make new method for stripe payment an option. 2022-04-08 12:38:49 +02:00
Laurent Destailleur
1d879bc996 FIX numbering method when mask include {cccc} 2022-04-08 10:19:20 +02:00
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Christophe Battarel
56bfa20d70 FIX : dont update object price on each iteration when updating situation for all lines 2022-04-07 15:59:42 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge 
can merge products
 2022-04-07 15:02:03 +02:00
Laurent Destailleur
4cac6b7e29 css 2022-04-07 14:03:14 +02:00
Laurent Destailleur
4693ef42bd Enhance responsive 2022-04-07 11:18:56 +02:00
Laurent Destailleur
091ca31b6c NEW Add method hintindex() in database handlers. 2022-04-06 17:32:56 +02:00
Laurent Destailleur
32875a1e6c Fix trans 2022-04-06 17:06:49 +02:00
Laurent Destailleur
8f93584f97 Fix trans 2022-04-06 16:56:23 +02:00
Laurent Destailleur
33b5605a72 Code comment 2022-04-06 16:49:59 +02:00
Laurent Destailleur
5a8d5618f2 Fix error message on IBAN/BIC validation 2022-04-06 16:15:34 +02:00
Laurent Destailleur
2e91b0107a Fix missing data in tooltip 2022-04-06 15:35:49 +02:00
Laurent Destailleur
c2f2f98235 css 2022-04-06 15:25:37 +02:00
Laurent Destailleur
a528cd46bd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
 2022-04-06 15:17:29 +02:00
Laurent Destailleur
1988459aa8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-06 14:54:02 +02:00
Laurent Destailleur
9459971ba4 Removed the awful "group by" on list of invoices. Add index on datef. 2022-04-06 14:53:22 +02:00
Laurent Destailleur
c3ae63f587 FIX out of memory when more than 100 000 invoices. 2022-04-06 11:34:49 +02:00
Laurent Destailleur
7896baa6c9 css 2022-04-05 18:20:45 +02:00
Laurent Destailleur
91909928d4 FIX Can't edit bank record 2022-04-05 18:19:06 +02:00
Laurent Destailleur
a8a83b30dc FIX Can't edit bank record 2022-04-05 18:17:45 +02:00
Laurent Destailleur
c7d5ecd4f7 Renamed hidden option INVOICE_CAN_ALWAYS_BE_EDITED into 
INVOICE_CAN_BE_EDITED_EVEN_IF_PAYMENT_DONE for better understanding.
 2022-04-05 17:39:56 +02:00
Laurent Destailleur
f0433244aa Fix sql 2022-04-05 13:36:25 +02:00
Laurent Destailleur
71012a7933 FIX #19777 #20281 2022-04-04 15:25:29 +02:00
Laurent Destailleur
01d100fc0c Missing autofocus on title field 2022-04-04 15:11:29 +02:00
Laurent Destailleur
5960d5971c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
 2022-04-04 10:49:51 +02:00
kamel
6cac982507 FIX - Fix the adding of lines in the create invoice functions 2022-04-04 10:32:17 +02:00
Laurent Destailleur
1c71a8da1e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/compta/accounting-files.php
 2022-04-03 17:27:15 +02:00
Laurent Destailleur
440b5350df # WARNING: head commit changed in the meantime 
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
 2022-04-03 17:19:27 +02:00
Laurent Destailleur
edf779505c FIX download of file must be done using a GET href link, not a POST. 2022-04-03 17:12:45 +02:00
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +02:00
Laurent Destailleur
5b91ae062f All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for 
code consistency purpose.
 2022-04-02 10:31:58 +02:00
atm-florian
5a52650548 FIX: missing trigger DELETE for FactureRec, FactureFournisseurRec 
+ trigger name consistency ('UPDATE' -> 'MODIFY')
 + preparing future consistency mechanism with class constant
 2022-04-01 19:07:17 +02:00
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-04-01 14:39:10 +02:00
Laurent Destailleur
8349e48559 Reponsive 2022-04-01 11:24:45 +02:00
Laurent Destailleur
ca55bd157a Look and feel v16 2022-03-31 11:47:18 +02:00
Laurent Destailleur
5062064e9a css 2022-03-31 11:38:40 +02:00
Laurent Destailleur
5ffb6e2546 Look and feel v15 2022-03-31 11:34:12 +02:00
Laurent Destailleur
800080c06f FIX Navigation between invoices 2022-03-30 18:42:17 +02:00
Laurent Destailleur
97a7450f10 NEW Auto set invoice paid when adding credit not and remain to pay is 0 2022-03-30 18:41:45 +02:00
kamel
a22450391f FIX - Fix search by filters 2022-03-30 15:50:36 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +02:00
ATM john
75d7c439dd Merge branch '14.0_fix_regression_selct_extrafield_search' of github.com:atm-john/dolibarr into new_fix_regression_select_extrafield_search 2022-03-30 11:09:29 +02:00
Ferran Marcet
f8b457e61c Merge branch '15.0up' into 15.0 2022-03-30 09:34:28 +02:00
Ferran Marcet
dd20907d53 Fix: Sales representative column crash on invoice list 2022-03-30 09:33:14 +02:00
Laurent Destailleur
8eeb6f3c8d
Merge pull request #20315 from atm-steve/FIX_Facture_dolGetButtonAction 
Fix: Facture dolGetButtonAction
 2022-03-29 21:11:24 +02:00
Laurent Destailleur
636188f28a
Merge pull request #20247 from thomas-Ngr/develop_new_check_invoice_date 
NEW: check invoice date
 2022-03-29 16:07:31 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-03-29 15:55:47 +02:00
Laurent Destailleur
a415711a66 Fix phpcs 2022-03-29 15:47:54 +02:00
Laurent Destailleur
5f2ba49dfa Fix regression 2022-03-29 15:20:36 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
 2022-03-29 15:10:11 +02:00
Laurent Destailleur
007004c2e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/index.php
	htdocs/accountancy/supplier/lines.php
	htdocs/compta/facture/card.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/langs/en_US/errors.lang
 2022-03-29 15:02:29 +02:00
Laurent Destailleur
e2425c10e0 Fix log 2022-03-28 21:12:57 +02:00
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02:00
Laurent Destailleur
d75483552d Responsive 2022-03-26 15:48:36 +01:00
lvessiller
8a7b97bed1 FIX check thirdparty object loaded and properties exist 2022-03-25 16:47:41 +01:00
Gauthier PC portable 024
fdf8a3f4ad FIX : comment 2022-03-25 16:43:54 +01:00
Gauthier PC portable 024
ab2e6ddf43 FIX : forgotten form confirm before various payment delete 2022-03-25 16:41:41 +01:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Laurent Destailleur
644e509265 Rename "Reconciled" with "BankLineReconciled" for bank conciliation 2022-03-25 14:43:48 +01:00
Laurent Destailleur
9747efe050 Fix phpcs 2022-03-24 14:09:46 +01:00
Thomas Negre
6dfad5d69f facture/card.php: replace redirection by = '' 2022-03-24 11:09:39 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Laurent Destailleur
161e795759 Look and feel 2022-03-23 17:12:25 +01:00
Laurent Destailleur
0e3fa3cdc3
Merge pull request #20420 from defrance/patch-180 
NEW : add hook for more buttons
 2022-03-23 15:54:13 +01:00
Laurent Destailleur
2943e68c42 Fix regression 2022-03-22 16:57:39 +01:00
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
Laurent Destailleur
02e2f9815d NEW Add option INVOICEREC_SET_AUTOFILL_DATE_START/END 2022-03-22 11:47:25 +01:00
BENKE Charlene
5fd2ec3fda
add hook for more buttons 2022-03-21 15:43:37 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
Laurent Destailleur
a970f78c4e css 2022-03-17 21:34:14 +01:00
ATM john
53f4fd2af8 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0_fix_regression_selct_extrafield_search 2022-03-16 10:44:15 +01:00
ATM john
5e644ed0a4 Fix search degradation 2022-03-15 18:24:49 +01:00
Laurent Destailleur
cf13eb7ac7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-15 18:22:37 +01:00
Laurent Destailleur
38c77b00a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-13 22:19:14 +01:00
Laurent Destailleur
2367f0d030 Fix missing badge 2022-03-13 18:39:45 +01:00
Laurent Destailleur
ec4ba46582 NEW Add private and public notes on tax files. 2022-03-13 18:30:31 +01:00
Laurent Destailleur
8410298c7e Fix access to the bank receipt view 2022-03-12 18:23:06 +01:00
Laurent Destailleur
a2b880bdbf Fix access to the bank receipt view 2022-03-12 18:20:15 +01:00
Laurent Destailleur
961636ea35 CSS 2022-03-12 16:04:00 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
steve
c3b22ed26e wip: clean comments 2022-03-09 17:10:53 +01:00
steve
25fcb83b74 wip: reopen button 2022-03-09 16:41:26 +01:00
Steve
dcf5d984b0 Merge branch 'dolibarrdevelop' into WIP_Facture_dolGetButtonAction 2022-03-09 11:49:34 +01:00
Thomas Negre
7f527b85b0 use double quotes to compose SQL requests 2022-03-09 09:34:50 +01:00
Thomas Negre
4ad92a04fc stickler corrections 2022-03-09 09:25:52 +01:00
Thomas Negre
7c866ce6a2 facture/card.php: avoid validating invoices with date anterior to last invoice date 2022-03-09 09:25:52 +01:00
Thomas Negre
eda9622c9c Facture: enhance validation by adding INVOICE_CHECK_POSTERIOR_DATE option 2022-03-09 09:25:52 +01:00
Thomas Negre
ad416ef792 Facture: create method willBeLastOfSameType() 2022-03-09 09:25:52 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
lvessiller
19ad231012 FIX stickler-ci 2022-03-08 12:02:05 +01:00
lvessiller
397776d4a4 FIX check mandatory thirdparty fields for mass action 2022-03-08 11:29:01 +01:00
Laurent Destailleur
84b951c2f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-07 15:24:08 +01:00
Laurent Destailleur
c4a20685a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:38 +01:00
Laurent Destailleur
6bb49797f8
Merge pull request #20243 from JohnXLivingston/fix_template_name_typo 
Fix: typo in template name
 2022-03-07 14:55:02 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
 2022-03-07 13:23:47 +01:00
Laurent Destailleur
378dab69a6 FIX #19777 #20281 2022-03-07 13:21:32 +01:00
steve
665e401564 wip: replace butAction 2022-03-04 17:03:40 +01:00
Gauthier PC portable 024
7701ae2d19 FIX : in case of TVA refund, negative amount must be allowed 2022-03-04 13:55:52 +01:00
John Livingston
1ece554c92
Fix: typo in template name 
There was a typo in generated HTML comment.
 2022-03-01 17:39:38 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
9cc79de31b Clean code 2022-03-01 00:02:23 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
dfba29b3c6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/class/api.class.php
	htdocs/compta/facture/card.php
	htdocs/reception/list.php
 2022-02-28 22:30:17 +01:00
Laurent Destailleur
c1268a3e39
Merge pull request #20151 from aspangaro/14p34 
FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card
 2022-02-28 21:38:07 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
5a24552930 Fix doc 2022-02-28 20:03:21 +01:00
Laurent Destailleur
ca236c556a FIX Blocking situation when a payment was deleted in bank. 
FIX Missing or bad permissions
 2022-02-28 19:45:53 +01:00
Regis Houssin
9cf5bccf43 FIX options should not exists on invoices 2022-02-28 18:13:29 +01:00
Laurent Destailleur
aff7148ed8 Fix missing error management 2022-02-28 16:39:42 +01:00
Laurent Destailleur
99ddef0530 NEW Add API to get a tempalte invoice 2022-02-28 10:37:03 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-27 08:40:01 +01:00
Alexandre SPANGARO
18a8eac1cd Modify fix 2022-02-26 07:17:44 +01:00
Laurent Destailleur
adb4af7099 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:39:34 +01:00
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-25 19:00:10 +01:00
Laurent Destailleur
b989c257ad Fix report on salaries 2022-02-25 18:53:21 +01:00
Laurent Destailleur
7d6cbe0800
Merge pull request #20173 from thomas-Ngr/develop_new_SEPA_PmtTpInf_CdtTrfTxInf 
NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
 2022-02-25 13:48:32 +01:00
stickler-ci
a0bc41cdba Fixing style errors. 2022-02-24 14:32:59 +00:00
Gauthier PC portable 024
517562b465 NEW : solde() function evolution to be able to get solde until a chosen date 2022-02-24 15:26:11 +01:00
Thomas Negre
7c29b2421d only display SEPA XML option at account creation if module payment by bank transfer is enabled 2022-02-24 09:52:41 +01:00
Thomas Negre
83ed380e6b display XML SEPA config option only if 'payment by bank transfer' module is enabled 2022-02-23 16:36:57 +01:00
Thomas Negre
af4e1667e0 Payment by bank transfer: create optionnaly place payment type information (PmtTpInf) in credit transfer transaction information (CdtTrfTxInf) 
- introduce PAYMENTBYBANKTRANSFER_FORCE_HIGH_PRIORITY const
 2022-02-23 16:23:25 +01:00
Thomas Negre
7a13112ad8 bank card interface modification to allow configuration of payment type information in SEPA XML 2022-02-23 16:22:37 +01:00
Thomas Negre
6136de6a4a add 'pti_in_ctti' property for Account object. Update related methods. 2022-02-23 16:22:19 +01:00
atm-lena
ed6f4b4ee1 Display Salary Paiement on compta report 2022-02-23 15:33:51 +01:00
Alexandre SPANGARO
0510d84263 FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card 2022-02-23 06:08:20 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
Laurent Destailleur
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
bd58cf1b37 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-18 21:52:18 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2022-02-18 21:50:08 +01:00
Laurent Destailleur
28d8a28be6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-18 21:45:54 +01:00
Laurent Destailleur
959aa0ce59 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-18 21:44:34 +01:00
Laurent Destailleur
f295fa8ad4
Merge pull request #20108 from atm-maxime/fix_15_missing_hooks 
Fix : add missing formobjectoptions hook on 3 cards
 2022-02-18 20:23:09 +01:00
Laurent Destailleur
0517e2e2d3 Fix error 2022-02-18 18:35:21 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Maxime Kohlhaas
7a457478d5 Fix : add missing formobjectoptions hook on 3 cards 2022-02-18 08:23:12 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-17 20:50:03 +01:00
Laurent Destailleur
f1d84f5728
Merge pull request #20060 from hregis/fix_missing_default_or_current_value 
FIX missing default or current value
 2022-02-17 19:43:29 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Laurent Destailleur
ea4eed31f5
Merge pull request #20066 from javieralapps4up/develop 
FIX Andorra needs Code Banque
 2022-02-16 20:38:26 +01:00
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1 
NEW Hook getNomUrl available everywhere in tooltip of ref links
 2022-02-16 20:36:02 +01:00
Laurent Destailleur
2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php
 2022-02-16 20:31:55 +01:00
Laurent Destailleur
e0563d2bef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:07 +01:00
Laurent Destailleur
7029bb7000
Merge pull request #20077 from AlexisLaurier/bugfix/paymentByBankTransfertIndexTabEntity 
add missing entity check on list of withdraws on index of paymentbyba…
 2022-02-16 20:26:39 +01:00
Laurent Destailleur
aad292b41b
Merge pull request #20074 from altairisfr/fix_parentline_13.0 
More generic management of parentline
 2022-02-16 20:25:04 +01:00
Laurent Destailleur
a33ca21151
Merge pull request #20079 from AlexisLaurier/bugfix/fixPrelevmentLineDetails-ForBankPaymentTransfert 
manage details of prelevment line for bank transfer
 2022-02-16 20:22:54 +01:00
lvessiller
7e17167faf NEW total mark rate in list 2022-02-16 11:45:29 +01:00
Alexis LAURIER
ff8dcdc4b7 manage details of prelevment line for bank transfer 2022-02-16 10:52:20 +01:00
Alexis LAURIER
8b0280a9d2 add missing entity check on list of withdraws on index of paymentbybanktransfert 2022-02-16 10:26:44 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Frédéric FRANCE
935482ee22
uniformize 2022-02-15 19:04:18 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global 2022-02-15 18:14:44 +01:00
Frédéric FRANCE
d546e11fba
Update chargesociales.class.php 2022-02-15 17:13:08 +01:00
Christophe Battarel
ebada46a07 fix context for createfromclone 2022-02-15 12:14:48 +01:00