Commit Graph

5736 Commits

Author SHA1 Message Date
Laurent Destailleur
6cecc3c2aa Fix clean data after update 2022-01-07 10:25:58 +01:00
oscim
f157a22cd0
Update paiementfourn.class.php
For stock in fetch object payment id type
2022-01-06 16:55:24 +01:00
Laurent Destailleur
18978ac84e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-01-06 16:08:49 +01:00
Laurent Destailleur
f848953238
Merge pull request #19732 from defrance/patch-173
FIX : allow create supplier order from other external modules
2022-01-06 15:58:31 +01:00
Laurent Destailleur
a887e41600 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/compta/bank/info.php
	htdocs/compta/bank/line.php
	htdocs/compta/bank/releve.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/fourn/class/fournisseur.product.class.php
2022-01-04 09:45:31 +01:00
BENKE Charlene
883d6bd63a
Update card.php 2022-01-04 09:32:27 +01:00
BENKE Charlene
0bc33ef3b3
Create card.php 2022-01-04 09:26:10 +01:00
stickler-ci
4e1d4ea1ca Fixing style errors. 2022-01-04 08:23:49 +00:00
BENKE Charlene
e73573d7c4
fix : allow create from other external modules 2022-01-04 09:18:28 +01:00
Laurent Destailleur
cecb11bb1c Debug v15 2022-01-03 12:28:42 +01:00
Laurent Destailleur
a919ade1c6 Fixunit price 2021-12-30 20:00:04 +01:00
Laurent Destailleur
3967ce9c20 Fix unit price 2021-12-30 19:48:59 +01:00
Laurent Destailleur
8085c32b85
Merge pull request #19681 from atm-florianm/FIX_14.0_best_supplier_price_discount_applied_twice
FIX: discounts are applied twice for displaying best supplier price
2021-12-30 19:47:07 +01:00
Laurent Destailleur
64777acfc1 Fix unit price 2021-12-30 19:46:58 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2021-12-30 19:03:46 +01:00
Maxime Kohlhaas
1bb07dbc6b Fix #19404 : only validated invoice must be considered in unpaid indicator 2021-12-28 11:02:45 +01:00
Je2fb
369d125002
Update card.php
Fix bug when you create a supplier order from a project to keep the project when you select the supplier (Option RELOAD_PAGE_ON_SUPPLIER_CHANGE)
2021-12-23 22:47:30 +01:00
atm-florian
67910db532 FIX: discounts are applied both when fetching the best supplier price and when displaying it
cf. PR #18873
commit 2be2423dee
2021-12-23 19:00:39 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
f09e603bf4 Try for FIX #19562 2021-12-19 20:43:24 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
2021-12-19 00:36:22 +01:00
Laurent Destailleur
c08cc96c71
Merge pull request #19592 from Hystepik/develop#2
Fix #19545 : supplier order modification
2021-12-16 17:47:34 +01:00
Laurent Destailleur
39b4586957
Merge pull request #19624 from 1ocate/FIX_05_author_searching_include_first_and_last_name
Fix author searching include first and last name
2021-12-16 17:09:44 +01:00
Laurent Destailleur
9465edd8ec Add warning making payment if pending direct debit or credit trans 2021-12-16 14:09:56 +01:00
Laurent Destailleur
84400cf1d3 Fix backto page 2021-12-16 13:35:17 +01:00
Laurent Destailleur
43e682b56f Fix several pb with down payments 2021-12-16 12:33:45 +01:00
Jay Yeo
41e4e70c6e Fix author searching include first and last name 2021-12-16 16:28:45 +07:00
Jay Yeo
7c1879a11a Fix author searching include first and last name 2021-12-15 16:52:57 +07:00
Laurent Destailleur
6d94c6150b FIX sign of unit price into the supplier credit note 2021-12-13 17:56:28 +01:00
Laurent Destailleur
bb1d5daa82 css 2021-12-12 23:47:40 +01:00
lmarcouiller
0fc9be27bc Fix #19545 : supplier order modification 2021-12-10 11:26:19 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
Laurent Destailleur
f4d7cbe045 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-09 09:54:09 +01:00
Laurent Destailleur
7ce6009958 Removed deprecated option 2021-12-09 09:53:32 +01:00
Laurent Destailleur
160c8402ea
Merge pull request #19524 from 1ocate/typoReceive
Fix typo 'usercanreceived' -> 'usercanreceive' in '/htdocs/fourn/commande/card.php'
2021-12-08 21:39:55 +01:00
Laurent Destailleur
5007282d7a Fix missing info popup on product 2021-12-08 15:16:06 +01:00
lmarcouiller
093191aeeb FIx php8.0 warnings 2021-12-03 10:37:48 +01:00
Jay Yeo
63c7ab0302 Fix typo 'usercanreceived' -> 'usercanreceive' in 'card.php' 2021-12-01 14:29:24 +07:00
Laurent Destailleur
4189229b84
Merge pull request #19165 from Hystepik/develop#5
Fix: php 8.0 warning commercial part
2021-11-30 15:31:51 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Frédéric FRANCE
308998e21c
Merge remote-tracking branch 'upstream/develop' into productmerge 2021-11-28 21:14:12 +01:00
Laurent Destailleur
7cc9398661 css 2021-11-27 01:24:32 +01:00
Laurent Destailleur
654e20e9fb CSS 2021-11-27 01:11:59 +01:00
Frédéric FRANCE
99cddfa235
can merge products but experimental 2021-11-23 22:36:14 +01:00
Frédéric FRANCE
429e5cf517
can merge products but experimental 2021-11-23 22:02:55 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental 2021-11-23 21:38:29 +01:00
Gauthier PC portable 024
2c2f456827 Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-23 11:10:01 +01:00
Gauthier PC portable 024
74f5c092dc FIX : use $linecount = count($this->lines); 2021-11-23 10:44:43 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Gauthier PC portable 024
e02405edc9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:23:26 +01:00
Gauthier PC portable 024
9840c1e0fa Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:17:55 +01:00
Gauthier PC portable 024
e75b6ae0b4 FIX : it's better with an input number 2021-11-22 16:13:46 +01:00
Laurent Destailleur
63cd06394f Debug permission on supplier order.
Fix #huntr58ddbd8a-0faf-4b3f-aec9-5850bb19ab67
2021-11-20 15:41:31 +01:00
Laurent Destailleur
48d7378282 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/comm/action/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/ar_IQ/bills.lang
	htdocs/langs/ar_IQ/cashdesk.lang
	htdocs/langs/ar_IQ/modulebuilder.lang
	htdocs/langs/ar_IQ/partnership.lang
	htdocs/langs/ar_IQ/propal.lang
	htdocs/langs/ar_IQ/stocks.lang
	htdocs/langs/ar_IQ/ticket.lang
	htdocs/langs/en_AE/admin.lang
	htdocs/langs/en_US/receptions.lang
	htdocs/langs/en_ZA/admin.lang
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/reception/class/reception.class.php
2021-11-19 23:14:39 +01:00
Laurent Destailleur
635e9e9747 CSS 2021-11-19 22:28:20 +01:00
lmarcouiller
d1f5cb9184 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5 2021-11-19 14:01:52 +01:00
Laurent Destailleur
271f42e761 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/societe/list.php
2021-11-19 10:06:35 +01:00
Laurent Destailleur
e7a4f04da4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
2021-11-18 21:41:12 +01:00
Gauthier PC portable 024
23249751d5 FIX : reorder all lines when delete document line everywhere 2021-11-17 12:10:12 +01:00
Gauthier PC portable 024
72614ecc0d Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028 FIX : dev name 2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e Fixing style errors. 2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
f664a977c6 Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:05:17 +01:00
Gauthier PC portable 024
c55008e8af NEW : insert_discount() functions handle 2021-11-16 16:02:55 +01:00
Gauthier PC portable 024
9d41c1390d Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9 NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled 2021-11-16 14:09:18 +01:00
Laurent Destailleur
d279ee57ff Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/am_ET/admin.lang
	htdocs/langs/am_ET/cashdesk.lang
	htdocs/langs/am_ET/errors.lang
	htdocs/langs/am_ET/eventorganization.lang
	htdocs/langs/am_ET/knowledgemanagement.lang
	htdocs/langs/am_ET/languages.lang
	htdocs/langs/am_ET/main.lang
	htdocs/langs/am_ET/stocks.lang
	htdocs/langs/ar_EG/accountancy.lang
	htdocs/langs/ar_EG/ticket.lang
	htdocs/langs/ar_IQ/accountancy.lang
	htdocs/langs/ar_IQ/admin.lang
	htdocs/langs/ar_IQ/agenda.lang
	htdocs/langs/ar_IQ/banks.lang
	htdocs/langs/ar_IQ/bills.lang
	htdocs/langs/ar_IQ/bookmarks.lang
	htdocs/langs/ar_IQ/cashdesk.lang
	htdocs/langs/ar_IQ/categories.lang
	htdocs/langs/ar_IQ/companies.lang
	htdocs/langs/ar_IQ/compta.lang
	htdocs/langs/ar_IQ/contracts.lang
	htdocs/langs/ar_IQ/ecm.lang
	htdocs/langs/ar_IQ/errors.lang
	htdocs/langs/ar_IQ/eventorganization.lang
	htdocs/langs/ar_IQ/exports.lang
	htdocs/langs/ar_IQ/holiday.lang
	htdocs/langs/ar_IQ/hrm.lang
	htdocs/langs/ar_IQ/interventions.lang
	htdocs/langs/ar_IQ/knowledgemanagement.lang
	htdocs/langs/ar_IQ/languages.lang
	htdocs/langs/ar_IQ/mails.lang
	htdocs/langs/ar_IQ/main.lang
	htdocs/langs/ar_IQ/margins.lang
	htdocs/langs/ar_IQ/members.lang
	htdocs/langs/ar_IQ/modulebuilder.lang
	htdocs/langs/ar_IQ/mrp.lang
	htdocs/langs/ar_IQ/opensurvey.lang
	htdocs/langs/ar_IQ/orders.lang
	htdocs/langs/ar_IQ/other.lang
	htdocs/langs/ar_IQ/partnership.lang
	htdocs/langs/ar_IQ/printing.lang
	htdocs/langs/ar_IQ/productbatch.lang
	htdocs/langs/ar_IQ/products.lang
	htdocs/langs/ar_IQ/projects.lang
	htdocs/langs/ar_IQ/propal.lang
	htdocs/langs/ar_IQ/receptions.lang
	htdocs/langs/ar_IQ/salaries.lang
	htdocs/langs/ar_IQ/sendings.lang
	htdocs/langs/ar_IQ/stocks.lang
	htdocs/langs/ar_IQ/ticket.lang
	htdocs/langs/ar_IQ/trips.lang
	htdocs/langs/ar_IQ/users.lang
	htdocs/langs/ar_IQ/withdrawals.lang
	htdocs/langs/ar_IQ/workflow.lang
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/ar_SA/cashdesk.lang
	htdocs/langs/ar_SA/errors.lang
	htdocs/langs/ar_SA/eventorganization.lang
	htdocs/langs/ar_SA/knowledgemanagement.lang
	htdocs/langs/ar_SA/languages.lang
	htdocs/langs/ar_SA/main.lang
	htdocs/langs/ar_SA/stocks.lang
	htdocs/langs/ar_SA/ticket.lang
	htdocs/langs/az_AZ/admin.lang
	htdocs/langs/az_AZ/cashdesk.lang
	htdocs/langs/az_AZ/errors.lang
	htdocs/langs/az_AZ/eventorganization.lang
	htdocs/langs/az_AZ/knowledgemanagement.lang
	htdocs/langs/az_AZ/languages.lang
	htdocs/langs/az_AZ/main.lang
	htdocs/langs/az_AZ/stocks.lang
	htdocs/langs/bg_BG/admin.lang
	htdocs/langs/bg_BG/cashdesk.lang
	htdocs/langs/bg_BG/errors.lang
	htdocs/langs/bg_BG/eventorganization.lang
	htdocs/langs/bg_BG/knowledgemanagement.lang
	htdocs/langs/bg_BG/languages.lang
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/bg_BG/stocks.lang
	htdocs/langs/bn_BD/admin.lang
	htdocs/langs/bn_BD/cashdesk.lang
	htdocs/langs/bn_BD/errors.lang
	htdocs/langs/bn_BD/eventorganization.lang
	htdocs/langs/bn_BD/knowledgemanagement.lang
	htdocs/langs/bn_BD/languages.lang
	htdocs/langs/bn_BD/main.lang
	htdocs/langs/bn_BD/stocks.lang
	htdocs/langs/bn_IN/admin.lang
	htdocs/langs/bn_IN/cashdesk.lang
	htdocs/langs/bn_IN/errors.lang
	htdocs/langs/bn_IN/eventorganization.lang
	htdocs/langs/bn_IN/knowledgemanagement.lang
	htdocs/langs/bn_IN/languages.lang
	htdocs/langs/bn_IN/main.lang
	htdocs/langs/bn_IN/stocks.lang
	htdocs/langs/bs_BA/admin.lang
	htdocs/langs/bs_BA/cashdesk.lang
	htdocs/langs/bs_BA/errors.lang
	htdocs/langs/bs_BA/eventorganization.lang
	htdocs/langs/bs_BA/knowledgemanagement.lang
	htdocs/langs/bs_BA/languages.lang
	htdocs/langs/bs_BA/main.lang
	htdocs/langs/bs_BA/stocks.lang
	htdocs/langs/ca_ES/accountancy.lang
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/bills.lang
	htdocs/langs/ca_ES/cashdesk.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/eventorganization.lang
	htdocs/langs/ca_ES/holiday.lang
	htdocs/langs/ca_ES/languages.lang
	htdocs/langs/ca_ES/mails.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/partnership.lang
	htdocs/langs/ca_ES/stocks.lang
	htdocs/langs/ca_ES/ticket.lang
	htdocs/langs/ca_ES/withdrawals.lang
	htdocs/langs/ca_ES/workflow.lang
	htdocs/langs/cs_CZ/admin.lang
	htdocs/langs/cs_CZ/cashdesk.lang
	htdocs/langs/cs_CZ/errors.lang
	htdocs/langs/cs_CZ/eventorganization.lang
	htdocs/langs/cs_CZ/knowledgemanagement.lang
	htdocs/langs/cs_CZ/languages.lang
	htdocs/langs/cs_CZ/main.lang
	htdocs/langs/cs_CZ/stocks.lang
	htdocs/langs/da_DK/admin.lang
	htdocs/langs/da_DK/cashdesk.lang
	htdocs/langs/da_DK/errors.lang
	htdocs/langs/da_DK/eventorganization.lang
	htdocs/langs/da_DK/main.lang
	htdocs/langs/da_DK/stocks.lang
	htdocs/langs/de_AT/admin.lang
	htdocs/langs/de_AT/cashdesk.lang
	htdocs/langs/de_AT/eventorganization.lang
	htdocs/langs/de_AT/stocks.lang
	htdocs/langs/de_CH/admin.lang
	htdocs/langs/de_CH/cashdesk.lang
	htdocs/langs/de_CH/eventorganization.lang
	htdocs/langs/de_CH/main.lang
	htdocs/langs/de_CH/orders.lang
	htdocs/langs/de_CH/stocks.lang
	htdocs/langs/de_DE/accountancy.lang
	htdocs/langs/de_DE/admin.lang
	htdocs/langs/de_DE/banks.lang
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/de_DE/cashdesk.lang
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/de_DE/compta.lang
	htdocs/langs/de_DE/ecm.lang
	htdocs/langs/de_DE/errors.lang
	htdocs/langs/de_DE/eventorganization.lang
	htdocs/langs/de_DE/externalsite.lang
	htdocs/langs/de_DE/holiday.lang
	htdocs/langs/de_DE/knowledgemanagement.lang
	htdocs/langs/de_DE/languages.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/de_DE/margins.lang
	htdocs/langs/de_DE/members.lang
	htdocs/langs/de_DE/modulebuilder.lang
	htdocs/langs/de_DE/mrp.lang
	htdocs/langs/de_DE/orders.lang
	htdocs/langs/de_DE/productbatch.lang
	htdocs/langs/de_DE/projects.lang
	htdocs/langs/de_DE/receptions.lang
	htdocs/langs/de_DE/salaries.lang
	htdocs/langs/de_DE/stocks.lang
	htdocs/langs/de_DE/ticket.lang
	htdocs/langs/de_DE/users.lang
	htdocs/langs/de_DE/website.lang
	htdocs/langs/el_CY/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/eventorganization.lang
	htdocs/langs/el_GR/holiday.lang
	htdocs/langs/el_GR/knowledgemanagement.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/langs/en_AU/accountancy.lang
	htdocs/langs/en_AU/admin.lang
	htdocs/langs/en_AU/cashdesk.lang
	htdocs/langs/en_AU/eventorganization.lang
	htdocs/langs/en_AU/stocks.lang
	htdocs/langs/en_CA/accountancy.lang
	htdocs/langs/en_CA/admin.lang
	htdocs/langs/en_CA/cashdesk.lang
	htdocs/langs/en_CA/eventorganization.lang
	htdocs/langs/en_CA/stocks.lang
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/en_GB/cashdesk.lang
	htdocs/langs/en_GB/eventorganization.lang
	htdocs/langs/en_GB/stocks.lang
	htdocs/langs/en_IN/accountancy.lang
	htdocs/langs/en_IN/admin.lang
	htdocs/langs/en_IN/cashdesk.lang
	htdocs/langs/en_IN/eventorganization.lang
	htdocs/langs/en_IN/stocks.lang
	htdocs/langs/en_SG/accountancy.lang
	htdocs/langs/en_SG/admin.lang
	htdocs/langs/en_SG/cashdesk.lang
	htdocs/langs/en_SG/eventorganization.lang
	htdocs/langs/en_SG/stocks.lang
	htdocs/langs/es_AR/accountancy.lang
	htdocs/langs/es_AR/admin.lang
	htdocs/langs/es_AR/cashdesk.lang
	htdocs/langs/es_AR/eventorganization.lang
	htdocs/langs/es_AR/stocks.lang
	htdocs/langs/es_BO/accountancy.lang
	htdocs/langs/es_BO/admin.lang
	htdocs/langs/es_BO/cashdesk.lang
	htdocs/langs/es_BO/eventorganization.lang
	htdocs/langs/es_BO/stocks.lang
	htdocs/langs/es_CL/cashdesk.lang
	htdocs/langs/es_CL/eventorganization.lang
	htdocs/langs/es_CL/stocks.lang
	htdocs/langs/es_CL/trips.lang
	htdocs/langs/es_CO/accountancy.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/cashdesk.lang
	htdocs/langs/es_CO/eventorganization.lang
	htdocs/langs/es_CO/projects.lang
	htdocs/langs/es_CO/stocks.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/es_DO/accountancy.lang
	htdocs/langs/es_DO/admin.lang
	htdocs/langs/es_DO/cashdesk.lang
	htdocs/langs/es_DO/eventorganization.lang
	htdocs/langs/es_DO/stocks.lang
	htdocs/langs/es_EC/cashdesk.lang
	htdocs/langs/es_EC/eventorganization.lang
	htdocs/langs/es_EC/stocks.lang
	htdocs/langs/es_ES/accountancy.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/bills.lang
	htdocs/langs/es_ES/cashdesk.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/eventorganization.lang
	htdocs/langs/es_ES/holiday.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/mails.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/partnership.lang
	htdocs/langs/es_ES/salaries.lang
	htdocs/langs/es_ES/stocks.lang
	htdocs/langs/es_ES/ticket.lang
	htdocs/langs/es_ES/withdrawals.lang
	htdocs/langs/es_ES/workflow.lang
	htdocs/langs/es_GT/accountancy.lang
	htdocs/langs/es_GT/admin.lang
	htdocs/langs/es_GT/cashdesk.lang
	htdocs/langs/es_GT/eventorganization.lang
	htdocs/langs/es_GT/stocks.lang
	htdocs/langs/es_HN/accountancy.lang
	htdocs/langs/es_HN/admin.lang
	htdocs/langs/es_HN/cashdesk.lang
	htdocs/langs/es_HN/eventorganization.lang
	htdocs/langs/es_HN/stocks.lang
	htdocs/langs/es_MX/admin.lang
	htdocs/langs/es_MX/cashdesk.lang
	htdocs/langs/es_MX/eventorganization.lang
	htdocs/langs/es_MX/stocks.lang
	htdocs/langs/es_PA/accountancy.lang
	htdocs/langs/es_PA/admin.lang
	htdocs/langs/es_PA/cashdesk.lang
	htdocs/langs/es_PA/eventorganization.lang
	htdocs/langs/es_PA/stocks.lang
	htdocs/langs/es_PE/admin.lang
	htdocs/langs/es_PE/cashdesk.lang
	htdocs/langs/es_PE/eventorganization.lang
	htdocs/langs/es_PE/stocks.lang
	htdocs/langs/es_PY/accountancy.lang
	htdocs/langs/es_PY/admin.lang
	htdocs/langs/es_PY/cashdesk.lang
	htdocs/langs/es_PY/eventorganization.lang
	htdocs/langs/es_PY/stocks.lang
	htdocs/langs/es_US/accountancy.lang
	htdocs/langs/es_US/admin.lang
	htdocs/langs/es_US/cashdesk.lang
	htdocs/langs/es_US/eventorganization.lang
	htdocs/langs/es_US/stocks.lang
	htdocs/langs/es_UY/accountancy.lang
	htdocs/langs/es_UY/admin.lang
	htdocs/langs/es_UY/cashdesk.lang
	htdocs/langs/es_UY/eventorganization.lang
	htdocs/langs/es_UY/stocks.lang
	htdocs/langs/es_VE/accountancy.lang
	htdocs/langs/es_VE/admin.lang
	htdocs/langs/es_VE/cashdesk.lang
	htdocs/langs/es_VE/eventorganization.lang
	htdocs/langs/es_VE/stocks.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/cashdesk.lang
	htdocs/langs/et_EE/errors.lang
	htdocs/langs/et_EE/eventorganization.lang
	htdocs/langs/et_EE/knowledgemanagement.lang
	htdocs/langs/et_EE/languages.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/eu_ES/admin.lang
	htdocs/langs/eu_ES/cashdesk.lang
	htdocs/langs/eu_ES/errors.lang
	htdocs/langs/eu_ES/eventorganization.lang
	htdocs/langs/eu_ES/knowledgemanagement.lang
	htdocs/langs/eu_ES/languages.lang
	htdocs/langs/eu_ES/main.lang
	htdocs/langs/eu_ES/stocks.lang
	htdocs/langs/fa_IR/admin.lang
	htdocs/langs/fa_IR/cashdesk.lang
	htdocs/langs/fa_IR/errors.lang
	htdocs/langs/fa_IR/eventorganization.lang
	htdocs/langs/fa_IR/knowledgemanagement.lang
	htdocs/langs/fa_IR/languages.lang
	htdocs/langs/fa_IR/main.lang
	htdocs/langs/fa_IR/stocks.lang
	htdocs/langs/fi_FI/admin.lang
	htdocs/langs/fi_FI/cashdesk.lang
	htdocs/langs/fi_FI/errors.lang
	htdocs/langs/fi_FI/eventorganization.lang
	htdocs/langs/fi_FI/knowledgemanagement.lang
	htdocs/langs/fi_FI/languages.lang
	htdocs/langs/fi_FI/main.lang
	htdocs/langs/fi_FI/stocks.lang
	htdocs/langs/fr_BE/admin.lang
	htdocs/langs/fr_BE/cashdesk.lang
	htdocs/langs/fr_BE/stocks.lang
	htdocs/langs/fr_CA/admin.lang
	htdocs/langs/fr_CA/cashdesk.lang
	htdocs/langs/fr_CA/stocks.lang
	htdocs/langs/fr_CH/accountancy.lang
	htdocs/langs/fr_CH/admin.lang
	htdocs/langs/fr_CH/cashdesk.lang
	htdocs/langs/fr_CH/members.lang
	htdocs/langs/fr_CH/orders.lang
	htdocs/langs/fr_CH/sendings.lang
	htdocs/langs/fr_CH/stocks.lang
	htdocs/langs/fr_CI/accountancy.lang
	htdocs/langs/fr_CI/admin.lang
	htdocs/langs/fr_CI/cashdesk.lang
	htdocs/langs/fr_CI/stocks.lang
	htdocs/langs/fr_CM/accountancy.lang
	htdocs/langs/fr_CM/admin.lang
	htdocs/langs/fr_CM/cashdesk.lang
	htdocs/langs/fr_CM/stocks.lang
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/agenda.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/ecm.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/eventorganization.lang
	htdocs/langs/fr_FR/holiday.lang
	htdocs/langs/fr_FR/hrm.lang
	htdocs/langs/fr_FR/knowledgemanagement.lang
	htdocs/langs/fr_FR/mails.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/mrp.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/langs/fr_FR/partnership.lang
	htdocs/langs/fr_FR/printing.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/fr_FR/propal.lang
	htdocs/langs/fr_FR/receptions.lang
	htdocs/langs/fr_FR/salaries.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/langs/fr_FR/workflow.lang
	htdocs/langs/fr_GA/accountancy.lang
	htdocs/langs/fr_GA/admin.lang
	htdocs/langs/fr_GA/cashdesk.lang
	htdocs/langs/fr_GA/stocks.lang
	htdocs/langs/gl_ES/accountancy.lang
	htdocs/langs/gl_ES/admin.lang
	htdocs/langs/gl_ES/cashdesk.lang
	htdocs/langs/gl_ES/errors.lang
	htdocs/langs/gl_ES/eventorganization.lang
	htdocs/langs/gl_ES/holiday.lang
	htdocs/langs/gl_ES/knowledgemanagement.lang
	htdocs/langs/gl_ES/languages.lang
	htdocs/langs/gl_ES/mails.lang
	htdocs/langs/gl_ES/main.lang
	htdocs/langs/gl_ES/partnership.lang
	htdocs/langs/gl_ES/stocks.lang
	htdocs/langs/gl_ES/ticket.lang
	htdocs/langs/gl_ES/withdrawals.lang
	htdocs/langs/gl_ES/workflow.lang
	htdocs/langs/he_IL/admin.lang
	htdocs/langs/he_IL/cashdesk.lang
	htdocs/langs/he_IL/errors.lang
	htdocs/langs/he_IL/eventorganization.lang
	htdocs/langs/he_IL/knowledgemanagement.lang
	htdocs/langs/he_IL/languages.lang
	htdocs/langs/he_IL/main.lang
	htdocs/langs/he_IL/stocks.lang
	htdocs/langs/hi_IN/admin.lang
	htdocs/langs/hi_IN/cashdesk.lang
	htdocs/langs/hi_IN/errors.lang
	htdocs/langs/hi_IN/eventorganization.lang
	htdocs/langs/hi_IN/knowledgemanagement.lang
	htdocs/langs/hi_IN/languages.lang
	htdocs/langs/hi_IN/main.lang
	htdocs/langs/hi_IN/stocks.lang
	htdocs/langs/hr_HR/admin.lang
	htdocs/langs/hr_HR/cashdesk.lang
	htdocs/langs/hr_HR/errors.lang
	htdocs/langs/hr_HR/eventorganization.lang
	htdocs/langs/hr_HR/knowledgemanagement.lang
	htdocs/langs/hr_HR/languages.lang
	htdocs/langs/hr_HR/main.lang
	htdocs/langs/hr_HR/stocks.lang
	htdocs/langs/hu_HU/admin.lang
	htdocs/langs/hu_HU/cashdesk.lang
	htdocs/langs/hu_HU/errors.lang
	htdocs/langs/hu_HU/eventorganization.lang
	htdocs/langs/hu_HU/holiday.lang
	htdocs/langs/hu_HU/knowledgemanagement.lang
	htdocs/langs/hu_HU/languages.lang
	htdocs/langs/hu_HU/main.lang
	htdocs/langs/hu_HU/other.lang
	htdocs/langs/hu_HU/products.lang
	htdocs/langs/hu_HU/stocks.lang
	htdocs/langs/hu_HU/ticket.lang
	htdocs/langs/id_ID/accountancy.lang
	htdocs/langs/id_ID/admin.lang
	htdocs/langs/id_ID/cashdesk.lang
	htdocs/langs/id_ID/errors.lang
	htdocs/langs/id_ID/eventorganization.lang
	htdocs/langs/id_ID/holiday.lang
	htdocs/langs/id_ID/interventions.lang
	htdocs/langs/id_ID/knowledgemanagement.lang
	htdocs/langs/id_ID/languages.lang
	htdocs/langs/id_ID/mails.lang
	htdocs/langs/id_ID/main.lang
	htdocs/langs/id_ID/mrp.lang
	htdocs/langs/id_ID/other.lang
	htdocs/langs/id_ID/products.lang
	htdocs/langs/id_ID/projects.lang
	htdocs/langs/id_ID/stocks.lang
	htdocs/langs/id_ID/ticket.lang
	htdocs/langs/id_ID/trips.lang
	htdocs/langs/id_ID/withdrawals.lang
	htdocs/langs/id_ID/workflow.lang
	htdocs/langs/is_IS/admin.lang
	htdocs/langs/is_IS/cashdesk.lang
	htdocs/langs/is_IS/errors.lang
	htdocs/langs/is_IS/eventorganization.lang
	htdocs/langs/is_IS/knowledgemanagement.lang
	htdocs/langs/is_IS/languages.lang
	htdocs/langs/is_IS/main.lang
	htdocs/langs/is_IS/stocks.lang
	htdocs/langs/it_IT/admin.lang
	htdocs/langs/it_IT/cashdesk.lang
	htdocs/langs/it_IT/errors.lang
	htdocs/langs/it_IT/eventorganization.lang
	htdocs/langs/it_IT/holiday.lang
	htdocs/langs/it_IT/knowledgemanagement.lang
	htdocs/langs/it_IT/languages.lang
	htdocs/langs/it_IT/main.lang
	htdocs/langs/it_IT/stocks.lang
	htdocs/langs/ja_JP/admin.lang
	htdocs/langs/ja_JP/cashdesk.lang
	htdocs/langs/ja_JP/companies.lang
	htdocs/langs/ja_JP/errors.lang
	htdocs/langs/ja_JP/eventorganization.lang
	htdocs/langs/ja_JP/holiday.lang
	htdocs/langs/ja_JP/main.lang
	htdocs/langs/ja_JP/projects.lang
	htdocs/langs/ja_JP/stocks.lang
	htdocs/langs/ka_GE/admin.lang
	htdocs/langs/ka_GE/cashdesk.lang
	htdocs/langs/ka_GE/errors.lang
	htdocs/langs/ka_GE/eventorganization.lang
	htdocs/langs/ka_GE/knowledgemanagement.lang
	htdocs/langs/ka_GE/languages.lang
	htdocs/langs/ka_GE/main.lang
	htdocs/langs/ka_GE/stocks.lang
	htdocs/langs/kk_KZ/accountancy.lang
	htdocs/langs/kk_KZ/admin.lang
	htdocs/langs/kk_KZ/agenda.lang
	htdocs/langs/kk_KZ/assets.lang
	htdocs/langs/kk_KZ/banks.lang
	htdocs/langs/kk_KZ/bills.lang
	htdocs/langs/kk_KZ/blockedlog.lang
	htdocs/langs/kk_KZ/bookmarks.lang
	htdocs/langs/kk_KZ/boxes.lang
	htdocs/langs/kk_KZ/cashdesk.lang
	htdocs/langs/kk_KZ/categories.lang
	htdocs/langs/kk_KZ/commercial.lang
	htdocs/langs/kk_KZ/companies.lang
	htdocs/langs/kk_KZ/compta.lang
	htdocs/langs/kk_KZ/contracts.lang
	htdocs/langs/kk_KZ/cron.lang
	htdocs/langs/kk_KZ/deliveries.lang
	htdocs/langs/kk_KZ/dict.lang
	htdocs/langs/kk_KZ/donations.lang
	htdocs/langs/kk_KZ/ecm.lang
	htdocs/langs/kk_KZ/errors.lang
	htdocs/langs/kk_KZ/eventorganization.lang
	htdocs/langs/kk_KZ/exports.lang
	htdocs/langs/kk_KZ/externalsite.lang
	htdocs/langs/kk_KZ/ftp.lang
	htdocs/langs/kk_KZ/help.lang
	htdocs/langs/kk_KZ/holiday.lang
	htdocs/langs/kk_KZ/hrm.lang
	htdocs/langs/kk_KZ/install.lang
	htdocs/langs/kk_KZ/interventions.lang
	htdocs/langs/kk_KZ/intracommreport.lang
	htdocs/langs/kk_KZ/knowledgemanagement.lang
	htdocs/langs/kk_KZ/languages.lang
	htdocs/langs/kk_KZ/ldap.lang
	htdocs/langs/kk_KZ/link.lang
	htdocs/langs/kk_KZ/loan.lang
	htdocs/langs/kk_KZ/mailmanspip.lang
	htdocs/langs/kk_KZ/mails.lang
	htdocs/langs/kk_KZ/main.lang
	htdocs/langs/kk_KZ/margins.lang
	htdocs/langs/kk_KZ/members.lang
	htdocs/langs/kk_KZ/modulebuilder.lang
	htdocs/langs/kk_KZ/mrp.lang
	htdocs/langs/kk_KZ/multicurrency.lang
	htdocs/langs/kk_KZ/oauth.lang
	htdocs/langs/kk_KZ/opensurvey.lang
	htdocs/langs/kk_KZ/orders.lang
	htdocs/langs/kk_KZ/other.lang
	htdocs/langs/kk_KZ/partnership.lang
	htdocs/langs/kk_KZ/paybox.lang
	htdocs/langs/kk_KZ/paypal.lang
	htdocs/langs/kk_KZ/printing.lang
	htdocs/langs/kk_KZ/productbatch.lang
	htdocs/langs/kk_KZ/products.lang
	htdocs/langs/kk_KZ/projects.lang
	htdocs/langs/kk_KZ/propal.lang
	htdocs/langs/kk_KZ/receiptprinter.lang
	htdocs/langs/kk_KZ/receptions.lang
	htdocs/langs/kk_KZ/recruitment.lang
	htdocs/langs/kk_KZ/resource.lang
	htdocs/langs/kk_KZ/salaries.lang
	htdocs/langs/kk_KZ/sendings.lang
	htdocs/langs/kk_KZ/sms.lang
	htdocs/langs/kk_KZ/stocks.lang
	htdocs/langs/kk_KZ/stripe.lang
	htdocs/langs/kk_KZ/supplier_proposal.lang
	htdocs/langs/kk_KZ/suppliers.lang
	htdocs/langs/kk_KZ/ticket.lang
	htdocs/langs/kk_KZ/trips.lang
	htdocs/langs/kk_KZ/users.lang
	htdocs/langs/kk_KZ/website.lang
	htdocs/langs/kk_KZ/withdrawals.lang
	htdocs/langs/kk_KZ/workflow.lang
	htdocs/langs/kk_KZ/zapier.lang
	htdocs/langs/km_KH/admin.lang
	htdocs/langs/km_KH/cashdesk.lang
	htdocs/langs/km_KH/errors.lang
	htdocs/langs/km_KH/eventorganization.lang
	htdocs/langs/km_KH/knowledgemanagement.lang
	htdocs/langs/km_KH/languages.lang
	htdocs/langs/km_KH/main.lang
	htdocs/langs/km_KH/stocks.lang
	htdocs/langs/kn_IN/admin.lang
	htdocs/langs/kn_IN/cashdesk.lang
	htdocs/langs/kn_IN/errors.lang
	htdocs/langs/kn_IN/eventorganization.lang
	htdocs/langs/kn_IN/knowledgemanagement.lang
	htdocs/langs/kn_IN/languages.lang
	htdocs/langs/kn_IN/main.lang
	htdocs/langs/kn_IN/stocks.lang
	htdocs/langs/ko_KR/admin.lang
	htdocs/langs/ko_KR/cashdesk.lang
	htdocs/langs/ko_KR/errors.lang
	htdocs/langs/ko_KR/eventorganization.lang
	htdocs/langs/ko_KR/knowledgemanagement.lang
	htdocs/langs/ko_KR/languages.lang
	htdocs/langs/ko_KR/main.lang
	htdocs/langs/ko_KR/stocks.lang
	htdocs/langs/lo_LA/accountancy.lang
	htdocs/langs/lo_LA/admin.lang
	htdocs/langs/lo_LA/cashdesk.lang
	htdocs/langs/lo_LA/errors.lang
	htdocs/langs/lo_LA/eventorganization.lang
	htdocs/langs/lo_LA/holiday.lang
	htdocs/langs/lo_LA/interventions.lang
	htdocs/langs/lo_LA/knowledgemanagement.lang
	htdocs/langs/lo_LA/languages.lang
	htdocs/langs/lo_LA/mails.lang
	htdocs/langs/lo_LA/main.lang
	htdocs/langs/lo_LA/mrp.lang
	htdocs/langs/lo_LA/other.lang
	htdocs/langs/lo_LA/products.lang
	htdocs/langs/lo_LA/projects.lang
	htdocs/langs/lo_LA/stocks.lang
	htdocs/langs/lo_LA/ticket.lang
	htdocs/langs/lo_LA/trips.lang
	htdocs/langs/lo_LA/withdrawals.lang
	htdocs/langs/lo_LA/workflow.lang
	htdocs/langs/lt_LT/admin.lang
	htdocs/langs/lt_LT/cashdesk.lang
	htdocs/langs/lt_LT/errors.lang
	htdocs/langs/lt_LT/eventorganization.lang
	htdocs/langs/lt_LT/knowledgemanagement.lang
	htdocs/langs/lt_LT/languages.lang
	htdocs/langs/lt_LT/main.lang
	htdocs/langs/lt_LT/stocks.lang
	htdocs/langs/lv_LV/accountancy.lang
	htdocs/langs/lv_LV/admin.lang
	htdocs/langs/lv_LV/cashdesk.lang
	htdocs/langs/lv_LV/errors.lang
	htdocs/langs/lv_LV/eventorganization.lang
	htdocs/langs/lv_LV/holiday.lang
	htdocs/langs/lv_LV/interventions.lang
	htdocs/langs/lv_LV/languages.lang
	htdocs/langs/lv_LV/mails.lang
	htdocs/langs/lv_LV/main.lang
	htdocs/langs/lv_LV/other.lang
	htdocs/langs/lv_LV/partnership.lang
	htdocs/langs/lv_LV/products.lang
	htdocs/langs/lv_LV/projects.lang
	htdocs/langs/lv_LV/stocks.lang
	htdocs/langs/lv_LV/ticket.lang
	htdocs/langs/lv_LV/withdrawals.lang
	htdocs/langs/lv_LV/workflow.lang
	htdocs/langs/mk_MK/admin.lang
	htdocs/langs/mk_MK/cashdesk.lang
	htdocs/langs/mk_MK/errors.lang
	htdocs/langs/mk_MK/eventorganization.lang
	htdocs/langs/mk_MK/knowledgemanagement.lang
	htdocs/langs/mk_MK/languages.lang
	htdocs/langs/mk_MK/main.lang
	htdocs/langs/mk_MK/stocks.lang
	htdocs/langs/mn_MN/admin.lang
	htdocs/langs/mn_MN/cashdesk.lang
	htdocs/langs/mn_MN/errors.lang
	htdocs/langs/mn_MN/eventorganization.lang
	htdocs/langs/mn_MN/knowledgemanagement.lang
	htdocs/langs/mn_MN/languages.lang
	htdocs/langs/mn_MN/main.lang
	htdocs/langs/mn_MN/stocks.lang
	htdocs/langs/nb_NO/admin.lang
	htdocs/langs/nb_NO/cashdesk.lang
	htdocs/langs/nb_NO/errors.lang
	htdocs/langs/nb_NO/eventorganization.lang
	htdocs/langs/nb_NO/knowledgemanagement.lang
	htdocs/langs/nb_NO/languages.lang
	htdocs/langs/nb_NO/main.lang
	htdocs/langs/nb_NO/stocks.lang
	htdocs/langs/nb_NO/ticket.lang
	htdocs/langs/nb_NO/workflow.lang
	htdocs/langs/ne_NP/admin.lang
	htdocs/langs/ne_NP/cashdesk.lang
	htdocs/langs/ne_NP/errors.lang
	htdocs/langs/ne_NP/eventorganization.lang
	htdocs/langs/ne_NP/knowledgemanagement.lang
	htdocs/langs/ne_NP/languages.lang
	htdocs/langs/ne_NP/main.lang
	htdocs/langs/ne_NP/stocks.lang
	htdocs/langs/nl_BE/cashdesk.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/cashdesk.lang
	htdocs/langs/nl_NL/errors.lang
	htdocs/langs/nl_NL/eventorganization.lang
	htdocs/langs/nl_NL/knowledgemanagement.lang
	htdocs/langs/nl_NL/languages.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/mrp.lang
	htdocs/langs/nl_NL/salaries.lang
	htdocs/langs/nl_NL/stocks.lang
	htdocs/langs/nl_NL/ticket.lang
	htdocs/langs/pl_PL/admin.lang
	htdocs/langs/pl_PL/cashdesk.lang
	htdocs/langs/pl_PL/errors.lang
	htdocs/langs/pl_PL/eventorganization.lang
	htdocs/langs/pl_PL/main.lang
	htdocs/langs/pl_PL/stocks.lang
	htdocs/langs/pl_PL/trips.lang
	htdocs/langs/pl_PL/workflow.lang
	htdocs/langs/pt_BR/admin.lang
	htdocs/langs/pt_BR/eventorganization.lang
	htdocs/langs/pt_PT/admin.lang
	htdocs/langs/pt_PT/cashdesk.lang
	htdocs/langs/pt_PT/errors.lang
	htdocs/langs/pt_PT/eventorganization.lang
	htdocs/langs/pt_PT/knowledgemanagement.lang
	htdocs/langs/pt_PT/languages.lang
	htdocs/langs/pt_PT/main.lang
	htdocs/langs/pt_PT/stocks.lang
	htdocs/langs/ro_RO/admin.lang
	htdocs/langs/ro_RO/cashdesk.lang
	htdocs/langs/ro_RO/errors.lang
	htdocs/langs/ro_RO/eventorganization.lang
	htdocs/langs/ro_RO/knowledgemanagement.lang
	htdocs/langs/ro_RO/languages.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ru_RU/accountancy.lang
	htdocs/langs/ru_RU/admin.lang
	htdocs/langs/ru_RU/cashdesk.lang
	htdocs/langs/ru_RU/errors.lang
	htdocs/langs/ru_RU/eventorganization.lang
	htdocs/langs/ru_RU/holiday.lang
	htdocs/langs/ru_RU/interventions.lang
	htdocs/langs/ru_RU/languages.lang
	htdocs/langs/ru_RU/mails.lang
	htdocs/langs/ru_RU/main.lang
	htdocs/langs/ru_RU/other.lang
	htdocs/langs/ru_RU/partnership.lang
	htdocs/langs/ru_RU/products.lang
	htdocs/langs/ru_RU/projects.lang
	htdocs/langs/ru_RU/stocks.lang
	htdocs/langs/ru_RU/ticket.lang
	htdocs/langs/ru_RU/trips.lang
	htdocs/langs/ru_RU/withdrawals.lang
	htdocs/langs/ru_RU/workflow.lang
	htdocs/langs/ru_UA/accountancy.lang
	htdocs/langs/ru_UA/admin.lang
	htdocs/langs/ru_UA/cashdesk.lang
	htdocs/langs/ru_UA/eventorganization.lang
	htdocs/langs/ru_UA/stocks.lang
	htdocs/langs/sk_SK/admin.lang
	htdocs/langs/sk_SK/cashdesk.lang
	htdocs/langs/sk_SK/errors.lang
	htdocs/langs/sk_SK/eventorganization.lang
	htdocs/langs/sk_SK/knowledgemanagement.lang
	htdocs/langs/sk_SK/languages.lang
	htdocs/langs/sk_SK/main.lang
	htdocs/langs/sk_SK/stocks.lang
	htdocs/langs/sl_SI/admin.lang
	htdocs/langs/sl_SI/cashdesk.lang
	htdocs/langs/sl_SI/errors.lang
	htdocs/langs/sl_SI/eventorganization.lang
	htdocs/langs/sl_SI/knowledgemanagement.lang
	htdocs/langs/sl_SI/languages.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/sl_SI/stocks.lang
	htdocs/langs/sq_AL/admin.lang
	htdocs/langs/sq_AL/cashdesk.lang
	htdocs/langs/sq_AL/errors.lang
	htdocs/langs/sq_AL/eventorganization.lang
	htdocs/langs/sq_AL/knowledgemanagement.lang
	htdocs/langs/sq_AL/languages.lang
	htdocs/langs/sq_AL/main.lang
	htdocs/langs/sq_AL/stocks.lang
	htdocs/langs/sr_RS/admin.lang
	htdocs/langs/sr_RS/cashdesk.lang
	htdocs/langs/sr_RS/errors.lang
	htdocs/langs/sr_RS/eventorganization.lang
	htdocs/langs/sr_RS/knowledgemanagement.lang
	htdocs/langs/sr_RS/languages.lang
	htdocs/langs/sr_RS/main.lang
	htdocs/langs/sr_RS/stocks.lang
	htdocs/langs/sv_SE/accountancy.lang
	htdocs/langs/sv_SE/admin.lang
	htdocs/langs/sv_SE/agenda.lang
	htdocs/langs/sv_SE/banks.lang
	htdocs/langs/sv_SE/bookmarks.lang
	htdocs/langs/sv_SE/cashdesk.lang
	htdocs/langs/sv_SE/categories.lang
	htdocs/langs/sv_SE/compta.lang
	htdocs/langs/sv_SE/errors.lang
	htdocs/langs/sv_SE/eventorganization.lang
	htdocs/langs/sv_SE/knowledgemanagement.lang
	htdocs/langs/sv_SE/languages.lang
	htdocs/langs/sv_SE/main.lang
	htdocs/langs/sv_SE/members.lang
	htdocs/langs/sv_SE/modulebuilder.lang
	htdocs/langs/sv_SE/projects.lang
	htdocs/langs/sv_SE/propal.lang
	htdocs/langs/sv_SE/receptions.lang
	htdocs/langs/sv_SE/salaries.lang
	htdocs/langs/sv_SE/stocks.lang
	htdocs/langs/sv_SE/ticket.lang
	htdocs/langs/sw_SW/admin.lang
	htdocs/langs/sw_SW/cashdesk.lang
	htdocs/langs/sw_SW/errors.lang
	htdocs/langs/sw_SW/eventorganization.lang
	htdocs/langs/sw_SW/knowledgemanagement.lang
	htdocs/langs/sw_SW/languages.lang
	htdocs/langs/sw_SW/main.lang
	htdocs/langs/sw_SW/stocks.lang
	htdocs/langs/tg_TJ/accountancy.lang
	htdocs/langs/tg_TJ/admin.lang
	htdocs/langs/tg_TJ/agenda.lang
	htdocs/langs/tg_TJ/assets.lang
	htdocs/langs/tg_TJ/banks.lang
	htdocs/langs/tg_TJ/bills.lang
	htdocs/langs/tg_TJ/blockedlog.lang
	htdocs/langs/tg_TJ/bookmarks.lang
	htdocs/langs/tg_TJ/boxes.lang
	htdocs/langs/tg_TJ/cashdesk.lang
	htdocs/langs/tg_TJ/categories.lang
	htdocs/langs/tg_TJ/commercial.lang
	htdocs/langs/tg_TJ/companies.lang
	htdocs/langs/tg_TJ/compta.lang
	htdocs/langs/tg_TJ/contracts.lang
	htdocs/langs/tg_TJ/cron.lang
	htdocs/langs/tg_TJ/deliveries.lang
	htdocs/langs/tg_TJ/dict.lang
	htdocs/langs/tg_TJ/donations.lang
	htdocs/langs/tg_TJ/ecm.lang
	htdocs/langs/tg_TJ/errors.lang
	htdocs/langs/tg_TJ/eventorganization.lang
	htdocs/langs/tg_TJ/exports.lang
	htdocs/langs/tg_TJ/externalsite.lang
	htdocs/langs/tg_TJ/ftp.lang
	htdocs/langs/tg_TJ/help.lang
	htdocs/langs/tg_TJ/holiday.lang
	htdocs/langs/tg_TJ/hrm.lang
	htdocs/langs/tg_TJ/install.lang
	htdocs/langs/tg_TJ/interventions.lang
	htdocs/langs/tg_TJ/intracommreport.lang
	htdocs/langs/tg_TJ/knowledgemanagement.lang
	htdocs/langs/tg_TJ/languages.lang
	htdocs/langs/tg_TJ/ldap.lang
	htdocs/langs/tg_TJ/link.lang
	htdocs/langs/tg_TJ/loan.lang
	htdocs/langs/tg_TJ/mailmanspip.lang
	htdocs/langs/tg_TJ/mails.lang
	htdocs/langs/tg_TJ/main.lang
	htdocs/langs/tg_TJ/margins.lang
	htdocs/langs/tg_TJ/members.lang
	htdocs/langs/tg_TJ/modulebuilder.lang
	htdocs/langs/tg_TJ/mrp.lang
	htdocs/langs/tg_TJ/multicurrency.lang
	htdocs/langs/tg_TJ/oauth.lang
	htdocs/langs/tg_TJ/opensurvey.lang
	htdocs/langs/tg_TJ/orders.lang
	htdocs/langs/tg_TJ/other.lang
	htdocs/langs/tg_TJ/partnership.lang
	htdocs/langs/tg_TJ/paybox.lang
	htdocs/langs/tg_TJ/paypal.lang
	htdocs/langs/tg_TJ/printing.lang
	htdocs/langs/tg_TJ/productbatch.lang
	htdocs/langs/tg_TJ/products.lang
	htdocs/langs/tg_TJ/projects.lang
	htdocs/langs/tg_TJ/propal.lang
	htdocs/langs/tg_TJ/receiptprinter.lang
	htdocs/langs/tg_TJ/receptions.lang
	htdocs/langs/tg_TJ/recruitment.lang
	htdocs/langs/tg_TJ/resource.lang
	htdocs/langs/tg_TJ/salaries.lang
	htdocs/langs/tg_TJ/sendings.lang
	htdocs/langs/tg_TJ/sms.lang
	htdocs/langs/tg_TJ/stocks.lang
	htdocs/langs/tg_TJ/stripe.lang
	htdocs/langs/tg_TJ/supplier_proposal.lang
	htdocs/langs/tg_TJ/suppliers.lang
	htdocs/langs/tg_TJ/ticket.lang
	htdocs/langs/tg_TJ/trips.lang
	htdocs/langs/tg_TJ/users.lang
	htdocs/langs/tg_TJ/website.lang
	htdocs/langs/tg_TJ/withdrawals.lang
	htdocs/langs/tg_TJ/workflow.lang
	htdocs/langs/tg_TJ/zapier.lang
	htdocs/langs/th_TH/admin.lang
	htdocs/langs/th_TH/cashdesk.lang
	htdocs/langs/th_TH/errors.lang
	htdocs/langs/th_TH/eventorganization.lang
	htdocs/langs/th_TH/knowledgemanagement.lang
	htdocs/langs/th_TH/languages.lang
	htdocs/langs/th_TH/main.lang
	htdocs/langs/th_TH/stocks.lang
	htdocs/langs/tr_TR/accountancy.lang
	htdocs/langs/tr_TR/admin.lang
	htdocs/langs/tr_TR/cashdesk.lang
	htdocs/langs/tr_TR/errors.lang
	htdocs/langs/tr_TR/eventorganization.lang
	htdocs/langs/tr_TR/knowledgemanagement.lang
	htdocs/langs/tr_TR/languages.lang
	htdocs/langs/tr_TR/main.lang
	htdocs/langs/tr_TR/stocks.lang
	htdocs/langs/uk_UA/admin.lang
	htdocs/langs/uk_UA/cashdesk.lang
	htdocs/langs/uk_UA/errors.lang
	htdocs/langs/uk_UA/eventorganization.lang
	htdocs/langs/uk_UA/knowledgemanagement.lang
	htdocs/langs/uk_UA/languages.lang
	htdocs/langs/uk_UA/main.lang
	htdocs/langs/uk_UA/stocks.lang
	htdocs/langs/uz_UZ/accountancy.lang
	htdocs/langs/uz_UZ/admin.lang
	htdocs/langs/uz_UZ/cashdesk.lang
	htdocs/langs/uz_UZ/errors.lang
	htdocs/langs/uz_UZ/eventorganization.lang
	htdocs/langs/uz_UZ/holiday.lang
	htdocs/langs/uz_UZ/interventions.lang
	htdocs/langs/uz_UZ/languages.lang
	htdocs/langs/uz_UZ/mails.lang
	htdocs/langs/uz_UZ/main.lang
	htdocs/langs/uz_UZ/other.lang
	htdocs/langs/uz_UZ/partnership.lang
	htdocs/langs/uz_UZ/products.lang
	htdocs/langs/uz_UZ/projects.lang
	htdocs/langs/uz_UZ/stocks.lang
	htdocs/langs/uz_UZ/ticket.lang
	htdocs/langs/uz_UZ/withdrawals.lang
	htdocs/langs/uz_UZ/workflow.lang
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/cashdesk.lang
	htdocs/langs/vi_VN/errors.lang
	htdocs/langs/vi_VN/eventorganization.lang
	htdocs/langs/vi_VN/knowledgemanagement.lang
	htdocs/langs/vi_VN/languages.lang
	htdocs/langs/vi_VN/main.lang
	htdocs/langs/vi_VN/stocks.lang
	htdocs/langs/zh_CN/admin.lang
	htdocs/langs/zh_CN/cashdesk.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/eventorganization.lang
	htdocs/langs/zh_CN/knowledgemanagement.lang
	htdocs/langs/zh_CN/languages.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_HK/admin.lang
	htdocs/langs/zh_HK/cashdesk.lang
	htdocs/langs/zh_HK/errors.lang
	htdocs/langs/zh_HK/eventorganization.lang
	htdocs/langs/zh_HK/knowledgemanagement.lang
	htdocs/langs/zh_HK/languages.lang
	htdocs/langs/zh_HK/main.lang
	htdocs/langs/zh_HK/stocks.lang
	htdocs/langs/zh_TW/admin.lang
	htdocs/langs/zh_TW/cashdesk.lang
	htdocs/langs/zh_TW/compta.lang
	htdocs/langs/zh_TW/errors.lang
	htdocs/langs/zh_TW/eventorganization.lang
	htdocs/langs/zh_TW/holiday.lang
	htdocs/langs/zh_TW/interventions.lang
	htdocs/langs/zh_TW/knowledgemanagement.lang
	htdocs/langs/zh_TW/languages.lang
	htdocs/langs/zh_TW/main.lang
	htdocs/langs/zh_TW/recruitment.lang
	htdocs/langs/zh_TW/salaries.lang
	htdocs/langs/zh_TW/stocks.lang
	htdocs/langs/zh_TW/ticket.lang
	htdocs/langs/zh_TW/workflow.lang
2021-11-16 10:46:38 +01:00
Ferran Marcet
7af883abc1 Fix: Bad date conversion 2021-11-15 16:43:54 +01:00
Laurent Destailleur
f2bfa8b2a1
Merge pull request #18940 from PyroShape/develop2
NEW : info of number of product still to dispatched in a supplier order
2021-11-15 13:58:43 +01:00
Laurent Destailleur
12f0a36095
Merge pull request #19284 from henrynopo/patch-1
Supplier Invoice Payment - Re-order the "Payment amount, original currency" to be together with the columns of original currency
2021-11-15 11:46:00 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
cb65903537 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/langs/en_US/bills.lang
2021-11-08 03:09:30 +01:00
Laurent Destailleur
e8b3875e2e FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 02:57:21 +01:00
Laurent Destailleur
5613ec71d6 Fix syntax 2021-11-07 17:48:01 +01:00
Laurent Destailleur
11bb7428ce Clean code 2021-11-07 12:34:08 +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
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
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
Vincent Dieltiens
a359c7a681 Handle case where credit note has no source invoice 2021-11-03 14:22:08 +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
899f0bee9a Fixing style errors. 2021-11-02 12:59:38 +00:00
Henry
b56eaf91e8
Update paiement.php 2021-11-02 20:53:00 +08:00
Benjamin Chantalat
5be40b926b Clean function not use anymore 2021-11-01 19:56:24 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
2021-10-31 16:19:10 +01:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Florian HENRY
9d15a7a18c fix: warning on delete wupplier order 2021-10-28 17:37:30 +02:00
Marc de Lima Lucio
668088a63f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-28 15:54:18 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00:00
Laurent Destailleur
dc1226b116 Fix #yogosha7508 2021-10-25 18:40:19 +02:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Lucas Marcouiller
051f6ca717 Fix: php 8.0 warning commercial part 2021-10-23 23:12:42 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
Laurent Destailleur
900d7512f2
Merge pull request #19121 from frederic34/fixrightswarning
fix multiple warnings
2021-10-22 22:47:28 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
2021-10-22 15:56:44 +02:00
Richard Franks
98eb07d6f2 FIX #18695 Added ref_ext to supplier invoice
Added ref_ext to the fields for create, fetch and update functions
on fournisseur.facture class. This enables the REST API to use
this field for additional information.
2021-10-22 10:39:14 +01:00
stickler-ci
4d63586e2a Fixing style errors. 2021-10-22 08:22:23 +00:00
Dennis Priskorn
e2e3e8ef7b
Update api_supplier_invoices.class.php
Add 2 examples
2021-10-22 10:18:23 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
289f90fb1e Fix qty must not use html type "number" but "text" (need decimal values) 2021-10-20 11:05:40 +02:00
Laurent Destailleur
6193e31eb4
Merge pull request #18999 from polkiko/payment_receipt
NEW Added linked files page and send mail possibility in payments
2021-10-19 12:25:37 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Jesús Jerez
43ac3230c3
Merge branch 'develop' into payment_receipt 2021-10-18 19:53:36 +02:00
Polkiko
c9ee0e5f93 Fixed error 2021-10-18 01:55:16 +02:00
stickler-ci
4c5e959911 Fixing style errors. 2021-10-17 23:52:24 +00:00
Polkiko
074b5589bd NEW Added documents page and send mail possibility in payments
- Documents page has been added to the payments page so that documents can be linked and see the generated pdf documents.
- The possibility of sending payments by email has been added, attaching the payment receipts in pdf.
- In pdf standard model of payment, the possibility of seeing the active iban of a third party has been added if it exists.
2021-10-18 01:15:12 +02:00
Laurent Destailleur
bd73545d08
Merge pull request #18985 from henrynopo/patch-5
Fix the rounding issue in case of multi-currency
2021-10-17 13:50:35 +02:00
Laurent Destailleur
b66155de4b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/list.php
	htdocs/filefunc.inc.php
2021-10-17 13:30:13 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
stickler-ci
fb79aaeb0c Fixing style errors. 2021-10-15 07:19:49 +00:00
Henry
316bc16634
Update card.php 2021-10-15 15:05:13 +08:00
Henry
3d62ee22d3
Supplier Invoice Payment List
fix the missing multicurrency payments and remainders
2021-10-15 11:13:40 +08:00
Marc de Lima Lucio
29768a1c6e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-13 11:33:04 +02:00
Laurent Destailleur
507d5962ab
Merge pull request #18960 from vincentjdc/project-edit-fordid-supplier-order
Add an option to forbid changing the project of a supplier order
2021-10-13 01:55:37 +02:00
Laurent Destailleur
365d5d4588
Update card.php 2021-10-13 01:55:24 +02:00
Vincent Dieltiens
7f07d82d3f Rename FORBID_EDIT_PROJECT_ON_SUPPLIER_ORDER into SUPPLIER_ORDER_FORBID_EDIT_PROJECT 2021-10-12 23:34:00 +02:00
Vincent Dieltiens
d58f334348 Add date_valid and date_approve columns in the list of supplier orders 2021-10-12 21:34:24 +02:00
Vincent Dieltiens
8370973a9d Add an option to forbird changing the project of a supplier order if validated or if in draft but already has a reference (not ) 2021-10-12 15:17:14 +02:00
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
2021-10-11 15:20:27 +02:00
Laurent Destailleur
9c749a37b1
Merge pull request #18930 from OPEN-DSI/v14-fix-optionals-create-card
FIX optional visibility on create card
2021-10-11 11:07:56 +02:00
Laurent Destailleur
b43dcb24f0
Update fournisseur.commande.class.php 2021-10-11 11:04:21 +02:00
Benjamin Chantalat
a7563ff62e Fix : Found non quoted or not casted var into sql request 2021-10-10 21:15:14 +02:00
stickler-ci
73bd05606c Fixing style errors. 2021-10-10 18:53:22 +00:00
Benjamin Chantalat
65c0167d07 ADD : info of number of product still to dispatched in a supplier order 2021-10-10 20:50:51 +02:00
Benjamin Chantalat
6e60e1f453 Fix date format into supplier order info tab 2021-10-09 20:38:46 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Alexandre SPANGARO
e68d9dc73c NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 22:02:56 +02:00
Laurent Destailleur
68ac62d09c Fix phpcs 2021-10-07 11:05:06 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/fourn/facture/card.php
2021-10-07 11:00:00 +02:00
Laurent Destailleur
e3032ef1c4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/fourn/facture/card.php
2021-10-06 16:06:25 +02:00
Laurent Destailleur
ad1cb443e4
Merge pull request #18520 from cfoellmann/PR/pdf-no-template
allow supplier order to not generate pdfs
2021-10-06 15:35:08 +02:00
Laurent Destailleur
10f0434116
Update card.php 2021-10-06 15:30:19 +02:00
Laurent Destailleur
3709c6ff47 Fix phpcs 2021-10-06 11:53:27 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 16:51:41 +02:00
Marc de Lima Lucio
0d174ebd71 cMerge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-05 14:57:21 +02:00
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
123c047e29 Fix look and feel v14 2021-10-05 13:34:25 +02:00
Marc de Lima Lucio
337531f832 FIX: deposit payment terms: correctly restrict them to objet other than invoices and template invoices 2021-10-05 10:54:22 +02:00
Alexandre SPANGARO
2e49eee106 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:52:45 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
2021-10-04 14:53:44 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
JR-Polyline
2be2423dee
Fix dynamic prices not updating
When Dynamic price module active and an a math expression is used to compute buy price on supplier product card, the calculated price does not update on the card when saved.
Changing line 849 appears to solve this without any ill effect.
2021-10-01 21:30:25 +08:00
Florian HENRY
6d00097c89 fix 2021-09-30 16:37:52 +02:00
Florian HENRY
d0508d557b fix: checkbox for line selection between supplier order and supplier invoice was infective 2021-09-30 14:56:02 +02:00
Laurent Destailleur
89ac5a5be6
Merge pull request #18723 from PyroShape/develop
Explicit date_creation instead of date
2021-09-28 13:34:44 +02:00
Laurent Destailleur
f9913d2ebc
Merge branch 'develop' into develop#4 2021-09-28 13:21:43 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
2021-09-27 11:40:47 +02:00
Laurent Destailleur
b77cadf39a Fix filter 2021-09-27 11:38:34 +02:00
Benjamin Chantalat
5623e5f98a Correct isset 2021-09-26 19:09:09 +02:00
Benjamin Chantalat
5cf90d0247 Correct date format 2021-09-24 14:10:19 +02:00
Benjamin Chantalat
95342777d9
Merge branch 'Dolibarr:develop' into develop 2021-09-24 14:09:14 +02:00
Benjamin Chantalat
c1e1a53503 Update Explicit date_creation instead of date 2021-09-23 13:23:16 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
Laurent Destailleur
51b6318f88 FIX Test when date of invoie is in future (pb with TZ and offset) 2021-09-23 02:14:01 +02:00
Laurent Destailleur
1e0a7e4342 FIX Test when date of invoie is in future (pb with TZ and offset) 2021-09-23 02:10:39 +02:00
Benjamin Chantalat
14f8d7c56b
Merge branch 'Dolibarr:develop' into develop 2021-09-22 15:49:43 +02:00
lmarcouiller
7361941420 Close #18770 : Can enter buying price on line 2021-09-22 14:56:44 +02:00
lvessiller
991a7ffd43 FIX selected lines on supplier invoice create 2021-09-21 11:04:59 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
2021-09-20 17:15:12 +02:00
Alexandre SPANGARO
ce56f52a30 FIX #18698 Supplier invoice list - "alert" checkbox not working 2021-09-20 03:28:30 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
7dfedd242a Fix add confirm_deleteline as sensitive action 2021-09-18 19:43:38 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
2021-09-17 12:29:58 +02:00
Benjamin Chantalat
5035ad9be1 Explicit date_creation instead of date 2021-09-15 12:32:18 +02:00
Ferran Marcet
7a637104b2 Fix: Not filter by company when it is an external user 2021-09-15 11:29:12 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/reception/list.php
2021-09-09 16:11:29 +02:00
lmarcouiller
4928d03c4f update to have modify ! to empty() 2021-09-09 14:44:17 +02:00
lmarcouiller
8af6b8679e update with fournisseur && supplier_order 2021-09-09 14:40:39 +02:00
Laurent Destailleur
6df4f250a5
Update list.php 2021-09-09 14:21:20 +02:00
lmarcouiller
022f3e640d Fix #18660 : fix rights of supplier order with API 2021-09-09 13:28:30 +02:00
stickler-ci
3da71418ac Fixing style errors. 2021-09-09 08:52:26 +00:00
atm-gregr
b88a16b563 Merge branch '11.0_SupplierOrder_ValidateMassAction' of github.com:atm-gregr/dolibarr into NEW/develop_SupplierOrder_ValidateMassAction 2021-09-09 10:49:05 +02:00
atm-gregr
24117851cc NEW : massaction validate on supplier orders 2021-09-09 10:43:15 +02:00
Laurent Destailleur
ba38bfd038
Merge pull request #18616 from cfoellmann/fix-redirect-soc
fix GET parameter on redirect
2021-09-09 04:58:44 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
2021-09-08 22:13:35 +02:00
Laurent Destailleur
30856d5b18 FIX Relative discount with high nb of decimals 2021-09-08 22:09:02 +02:00
Christian Foellmann
c3f1ecb981 fix GET parameter on redirect 2021-09-06 09:14:19 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
c4621f0433 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2021-09-03 18:04:14 +02:00
Laurent Destailleur
2e3b6b2fc8 Backport sql injection fix from develop 2021-09-03 18:00:28 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
Laurent Destailleur
a7b0a837d4 Fix cancel button must be named "$cancel" everywhere. 2021-09-01 18:46:06 +02:00
Laurent Destailleur
f0a68d728a
Merge pull request #18548 from henrynopo/patch-17
Fix error of SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED
2021-09-01 18:17:37 +02:00
Laurent Destailleur
c4acfe5fc0
Merge pull request #18577 from Givriz/dev_2
Compatibility phpv8
2021-09-01 18:06:06 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
2021-09-01 17:52:04 +02:00
Givriz
688d217bed Compatibility phpv8 2021-09-01 16:39:28 +02:00
Vincent Dieltiens
2bad48bdcc FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject 2021-09-01 16:25:29 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
henrynopo
7bf6daaca7
Update card.php 2021-08-30 15:33:26 +08:00
Laurent Destailleur
feb2e71f0c Fix regression 2021-08-28 18:59:12 +02:00
Laurent Destailleur
8ab9c96b7e Fix 0 insert instead of null 2021-08-28 18:56:48 +02:00
Laurent Destailleur
e2eaa9b46e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:54:48 +02:00
Laurent Destailleur
5f08ed84f8 Fix 0 insert instead of null 2021-08-28 18:53:57 +02:00
Laurent Destailleur
97ee69e88f Fix 0 insert instead of null 2021-08-28 18:52:43 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
replace remaining SubmitCancel buttons
2021-08-28 18:39:06 +02:00
Laurent Destailleur
978511e127 Update fournisseur.facture.class.php
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
2021-08-28 17:59:45 +02:00
Laurent Destailleur
5ec286fdb7
Merge pull request #18500 from francisbesset/fix-fk_unit
Fix bad comparison for fk_unit to avoid always null value for all case
2021-08-28 17:57:26 +02:00
Laurent Destailleur
97064f1550
Update fournisseur.facture.class.php 2021-08-28 17:55:49 +02:00
Laurent Destailleur
301d7134b3
Merge branch 'develop' into patch-2 2021-08-28 17:37:54 +02:00
stickler-ci
63427638d8 Fixing style errors. 2021-08-28 14:54:16 +00:00
henrynopo
444786b34f
Update card.php 2021-08-28 22:52:06 +08:00
Laurent Destailleur
0db67b40a0
Merge pull request #18525 from cfoellmann/PR/thirdparty-links
change links for thirdparty to target the type customer|supplier tab
2021-08-28 15:27:13 +02:00
BENKE Charlene
afb8a86aff
Clean code (line in double) 2021-08-28 14:14:48 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Christian Foellmann
9752501ef6 change links for thirdparty to target the type customer|supplier tab 2021-08-27 15:32:53 +02:00
Christian Foellmann
9914ebe90b add missing actions to admin page 2021-08-27 10:21:02 +02:00
henrynopo
054b466e0a
Update card.php 2021-08-26 09:40:44 +08:00
Francis Besset
22ec43f4a3 Fix bad comparison for fk_unit to avoid always null value for all case 2021-08-25 13:46:18 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
90c12ae340 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-24 16:37:42 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/list.php
2021-08-24 16:37:18 +02:00
Laurent Destailleur
76c3f10842
Merge pull request #18438 from aspangaro/15a4
NEW Supplier order - Add From/to input on search date
2021-08-24 15:53:15 +02:00
Laurent Destailleur
1c665c34cd
Merge pull request #18485 from fappels/14_fix_supplier_order_card
Fix warning on supplier order card when reception enabled.
2021-08-24 15:31:05 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
henrynopo
73c0471ead Fix error of supplier invoice (variable amount)
This update fixed the coding error for addline of deposit invoice for variable amount.

In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
2021-08-24 15:12:15 +02:00
Laurent Destailleur
c3fe1bfdc0
Merge pull request #18459 from henrynopo/patch-9
Fix error of supplier invoice (variable amount)
2021-08-24 15:09:53 +02:00
Laurent Destailleur
67baa48c16 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/fourn/facture/list.php
2021-08-24 14:56:13 +02:00
Laurent Destailleur
6fa5930e8d Fix label must not be translated 2021-08-24 14:54:46 +02:00
Laurent Destailleur
b10f75932f
Merge pull request #18466 from aspangaro/14p16
FIX Supplier invoice list - Wrong language key used
2021-08-24 14:51:46 +02:00
henrynopo
3c1bdd163f
Update paiementfourn.class.php 2021-08-24 18:34:34 +08:00
Francis Appels
edeaa6009f Fix warning on supplier order card when reception enabled. 2021-08-24 10:48:26 +02:00
Laurent Destailleur
a6ddc90d5b Fix responsive 2021-08-23 23:53:58 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Alexandre SPANGARO
b5a4c58106 FIX Supplier invoice list - Wrong language key used 2021-08-22 22:42:40 +02:00
henrynopo
b4096dc057
Fix error of supplier invoice (variable amount)
This update fixed the coding error for addline of deposit invoice for variable amount.

In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
2021-08-22 13:26:46 +08:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Alexandre SPANGARO
797372cac2 NEW Supplier order - Add From/to input on search date 2021-08-18 22:30:33 +02:00