Commit Graph

11882 Commits

Author SHA1 Message Date
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
f04a07b6a7 FIX Pb with permission on holiday and expense report 2022-01-14 13:42:38 +01:00
ATM john
8ace96f495 Fix validate class lang load and test for numeric values 2022-01-14 11:46:31 +01:00
Laurent Destailleur
1ae01ba2fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-14 10:38:38 +01:00
Laurent Destailleur
62ae0361f7
Merge pull request #19818 from DATUC/patch-24
Update companies.lang
2022-01-14 10:19:48 +01:00
Laurent Destailleur
71e470eb6c
Merge pull request #19826 from atm-gauthier/FIX_hrm
FIX : several adaptations rank => rankorder and langs correction for HRM
2022-01-14 10:01:14 +01:00
Laurent Destailleur
b7aa152464 Fix trans 2022-01-14 09:55:13 +01:00
Gauthier PC portable 024
a77a2e9bcc FIX : several adaptations rank => rankorder and langs correction for HRM 2022-01-13 11:39:54 +01:00
DATUC
800de88c69
Update companies.lang 2022-01-12 12:26:06 +01:00
Laurent Destailleur
c024585ec9 Trans 2022-01-12 11:13:14 +01:00
Laurent Destailleur
5c4f521025
Merge pull request #19807 from DATUC/patch-14
Update companies.lang
2022-01-12 11:10:48 +01:00
Laurent Destailleur
8948d15930
Merge pull request #19798 from DATUC/patch-5
Update companies.lang
2022-01-12 11:10:31 +01:00
DATUC
e2306f5915
Update companies.lang 2022-01-12 00:41:05 +01:00
DATUC
89e509b251
Update companies.lang 2022-01-12 00:30:11 +01:00
DATUC
3384632005
Update companies.lang 2022-01-12 00:28:26 +01:00
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Alexandre SPANGARO
960aaded8e NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice 2022-01-09 21:08:06 +01:00
Florian HENRY
61fc81732c fix: #19749 2022-01-07 11:29:43 +01:00
Laurent Destailleur
26e8496c46 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/card.php
2022-01-06 16:15:58 +01:00
Laurent Destailleur
2d0f4cab51
Merge pull request #19705 from atm-maxime/fix_supplier_credit_transfer
Fix supplier credit transfer
2022-01-06 16:10:53 +01:00
Laurent Destailleur
b4ff7826db Trans 2022-01-06 16:08:21 +01:00
Laurent Destailleur
1e467c60f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/compta/facture/list.php
	htdocs/product/stock/movement_list.php
2022-01-06 11:15:28 +01:00
Laurent Destailleur
61cbf52a94 Fix tooltip email collector 2022-01-05 21:27:00 +01:00
Laurent Destailleur
1471c2422d Fix trans 2022-01-05 20:49:38 +01:00
Quentin VIAL-GOUTEYRON
7a4b0e38cd NEW : Contact filter project list 2022-01-05 14:35:11 +01:00
Alexandre SPANGARO
b719042b09 Missing language key on error 2022-01-04 10:47:59 +01:00
Quentin VIAL-GOUTEYRON
b1f750ac2f NEW: Project contact tab 2022-01-04 10:35:44 +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
Laurent Destailleur
807f2841d4 FIX Navigation on bank transaction list 2022-01-04 09:33:52 +01:00
Laurent Destailleur
6654b138b9 Fix trans 2022-01-03 22:11:04 +01:00
Laurent Destailleur
f8a97ef928 FIX a lot of problem with rules for password validation 2022-01-03 16:09:08 +01:00
Laurent Destailleur
f7871be6cd Debug v15 2022-01-03 03:06:18 +01:00
Laurent Destailleur
48c990a8bf Sync transifex 2022-01-02 18:22:18 +01:00
Laurent Destailleur
adec35d4b1 Debug v15 2022-01-02 15:46:28 +01:00
Anthony Berton
78861c1743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2021-12-29 19:21:03 +01:00
Maxime Kohlhaas
1e848f0ebb Fix prelevement right management and action buttons 2021-12-28 18:17:57 +01:00
Maxime Kohlhaas
93393b82a3 Fix nav + translations on supplier invoice credit transfer 2021-12-28 17:40:25 +01:00
Laurent Destailleur
a7ef4991fd Fix position of menu 2021-12-26 15:41:09 +01:00
Laurent Destailleur
4eb9a7625a Fix notification setup page. 2021-12-23 15:12:35 +01:00
lmarcouiller
8e11b1c996 import with select boxes 2021-12-23 11:25:57 +01:00
lmarcouiller
733e411a67 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-12-23 11:14:47 +01:00
Laurent Destailleur
dd94745e33 Fix css for rtl languages 2021-12-22 20:57:14 +01:00
Laurent Destailleur
de25cf3a72 NEW: Hidden option API_DISABLE_COMPRESSION is now visible in API setup
page.
2021-12-21 14:08:06 +01:00
Laurent Destailleur
12645926cc Fix text 2021-12-21 12:12:32 +01:00
lmarcouiller
11eac8eee9 Merge branch 'develop#1' of github.com:Hystepik/dolibarr into develop#1 2021-12-20 14:41:08 +01:00
Laurent Destailleur
0465afbc34 Fix css for takepos 2021-12-20 13:39:34 +01:00
Laurent Destailleur
ee3246bf65 Trans 2021-12-19 16:02:28 +01:00
Laurent Destailleur
19afcbbc40 css 2021-12-19 15:59:34 +01:00
Laurent Destailleur
771805cd83 More complete error management. 2021-12-19 03:36:25 +01:00
Laurent Destailleur
a662a980db Trans 2021-12-19 01:41:09 +01:00
Laurent Destailleur
bf441dda14 Fix report of expense-income must be without tax in debt 2021-12-18 18:11:28 +01:00
Laurent Destailleur
7266c78162 Clean/Debug code for v15 2021-12-17 17:40:30 +01:00
Laurent Destailleur
654cd8bd1c Fix for dol_string_onlythesehtmlattributes() 2021-12-17 12:01:25 +01:00
Laurent Destailleur
494e9a2745
Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-12-16 19:12:06 +01:00
Laurent Destailleur
81f4a1d80c
Merge pull request #19620 from frederic34/patch-1
check for mbstring extension at install
2021-12-16 17:16:28 +01:00
Laurent Destailleur
d92535ec59 FIX Debug transfert in accountancy for expense report 2021-12-16 15:41:23 +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
f589121199 Trans 2021-12-16 01:17:22 +01:00
Frédéric FRANCE
a02cb4c9b1
Update install.lang 2021-12-14 22:52:39 +01:00
Anthony Berton
9bc2a561bc ok 2021-12-14 10:52:16 +01:00
Laurent Destailleur
582caf0e7a FIX message for automatic binding not clear of what was done or not 2021-12-13 19:04:25 +01:00
Laurent Destailleur
e7b7c3281e Fix page of accountancy transaction 2021-12-13 17:42:10 +01:00
Laurent Destailleur
4d1e247a5c Trans 2021-12-10 12:51:00 +01:00
Laurent Destailleur
9fbe0dee9b Fix trans 2021-12-10 12:36:51 +01:00
Laurent Destailleur
ecf98530bb Debug SEPA payment module 2021-12-09 12:42:04 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
lmarcouiller
c6c7abbf1d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-12-07 10:48:17 +01:00
Laurent Destailleur
259b7dfe5a NEW: Add massaction to switch status on sale / on purchase of a product. 2021-12-06 02:48:34 +01:00
Laurent Destailleur
d62b3cafe4 Trans 2021-12-05 19:38:21 +01:00
Laurent Destailleur
9bad92f395 Trans 2021-12-05 19:25:15 +01:00
lmarcouiller
325ad45bca update scan inventory error gestion 2021-12-03 16:04:23 +01:00
Laurent Destailleur
212001ffa7 Trans 2021-12-03 15:15:08 +01:00
Laurent Destailleur
53ab2dd109 Trans 2021-12-03 15:13:20 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
3de3adad74 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/ajax/objectonoff.php
2021-11-30 16:11:12 +01:00
Laurent Destailleur
87a66c7bf0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-30 15:57:14 +01:00
Laurent Destailleur
f66f9082e7
Merge pull request #19509 from fr69400/patch3
FIX Html conversion check with PDF_BOLD_PRODUCT_LABEL
2021-11-30 14:04:10 +01:00
Laurent Destailleur
a7f9ffd5d0
Merge pull request #19461 from frederic34/lastactivationversion
keep info on latest activation version of module
2021-11-30 12:16:39 +01:00
Laurent Destailleur
cf165835bf
Merge pull request #19462 from KlaasOl/patch-5
Update main.lang
2021-11-30 12:00:35 +01:00
lmarcouiller
0d65fdad23 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-11-29 10:38:11 +01:00
Laurent Destailleur
e3e4b154e7 Fix partnership 2021-11-29 01:04:32 +01:00
Frédéric FRANCE
308998e21c
Merge remote-tracking branch 'upstream/develop' into productmerge 2021-11-28 21:14:12 +01:00
fr69400
5a165ae2bf FIX PDF_NOLD_PRODUCT_LABEL 2021-11-28 14:40:15 +01:00
Klaas Oldenburger
2030d55c67
Update main.lang
Did not complete earlier work.
2021-11-27 16:42:53 +01:00
Laurent Destailleur
7b68ef1fb8 Clean/Debug module hrm. 2021-11-27 14:46:47 +01:00
Laurent Destailleur
734c9871ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-11-27 01:07:32 +01:00
Marc de Lima Lucio
1361abffe5 FIX: holiday list: only mass delete if leave request is not in draft, canceled or refused, like in card 2021-11-26 18:22:31 +01:00
Laurent Destailleur
bf1dfac629 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/errors.lang
	htdocs/product/stock/movement_list.php
2021-11-25 21:54:06 +01:00
Laurent Destailleur
78f94b1c76 Fix css and label for recurring invoices 2021-11-25 14:17:20 +01:00
Laurent Destailleur
0c54723185 css 2021-11-25 10:28:37 +01:00
Laurent Destailleur
01038b190d Better error report on id command that failed 2021-11-24 22:35:10 +01:00
Gauthier PC portable 024
641002ae96 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-11-24 09:05:24 +01:00
Klaas Oldenburger
0b871ea0fb
Update main.lang
Changing date format the Dutch way
2021-11-24 08:06:56 +01:00
Frédéric FRANCE
e6af0facdd
keep info on latest activation version of module 2021-11-23 23:27:07 +01:00
Frédéric FRANCE
d9bcd27764
can merge products but experimental 2021-11-23 21:55:48 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental 2021-11-23 21:38:29 +01:00
Laurent Destailleur
ee14aa2597 Fix: Do not loose data on error when editing a line 2021-11-23 12:11:27 +01:00
Giovanni Vella
f7abf59a07
Merge branch 'Dolibarr:develop' into develop 2021-11-23 08:48:52 +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
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
fcf86d5a02 Trans 2021-11-20 16:02:57 +01:00
Laurent Destailleur
749ea1a922 Trans 2021-11-19 23:21:44 +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
c79fa4d3d0 NEW Add workflow action close purchase order on reception validation
NEW Add workflow action close purchase order on reception closing
2021-11-19 23:03:12 +01:00
Marc de Lima Lucio
bffd2fc939 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-11-19 16:12:33 +01:00
Laurent Destailleur
35b1868693 FIX Missing trans 2021-11-19 14:01:31 +01:00
Laurent Destailleur
bb6440af9d FIX Better label for reception status 2021-11-19 13:46:30 +01:00
Laurent Destailleur
92b0fde4ca Debug v15 2021-11-18 21:37:33 +01:00
Laurent Destailleur
2afe6ccb4b Debug feature shown/hide canceled orders 2021-11-18 21:26:35 +01:00
Laurent Destailleur
c6463c9a83
Merge pull request #19166 from polkiko/canceled_orders
NEW Canceled purchase orders do not qualify for total and are hidden
2021-11-18 20:56:42 +01:00
Laurent Destailleur
f525045c44
Merge pull request #19281 from aspangaro/15a29
NEW Thirdparty - Add advanced right to add / edit payment information
2021-11-18 20:32:55 +01:00
Laurent Destailleur
ba7a781c32
Merge pull request #19380 from atm-gauthier/NEW/accountancy_massaction_preselect_account_productaccount_page
NEW : accountancy massaction preselect account (productaccount page)
2021-11-18 20:30:07 +01:00
Laurent Destailleur
e652b93878 Autoswitch on inventory tab on validation of inventory
Fix disabled button when some data are available.
2021-11-18 12:58:31 +01:00
Laurent Destailleur
0c9fb16a36 Fix trans 2021-11-18 09:55:36 +01:00
Laurent Destailleur
0294f3dc34 Missing trans 2021-11-18 09:54:48 +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
Laurent Destailleur
e2000473a5 Sync transifex 2021-11-16 10:44:56 +01:00
Laurent Destailleur
fc1bf4a002 Trans 2021-11-16 10:36:07 +01:00
Alexandre SPANGARO
2ebdc6a430 Merge remote-tracking branch 'upstream/develop' into 15a29 2021-11-16 04:27:53 +01:00
Laurent Destailleur
9eb66548a5 Sync transifex 2021-11-15 19:02:26 +01:00
Laurent Destailleur
b77fd3d312 Fix trans 2021-11-15 18:48:14 +01:00
Laurent Destailleur
c839c0ceec Trans 2021-11-15 18:44:58 +01:00
Laurent Destailleur
878ee35e5d Sync transifex 2021-11-15 18:07:05 +01:00
Gauthier PC portable 024
7d1b409e59 NEW : accountancy massaction preselect account (productaccount page) 2021-11-15 14:35:55 +01:00
Laurent Destailleur
c995794e2d Fix kk_KZ language 2021-11-15 13:56:17 +01:00
Laurent Destailleur
cd2a09de42
Merge pull request #19170 from atm-john/new_setup_form_help_class
NEW : setup form class to help setup page creation
2021-11-15 12:12:25 +01:00
Laurent Destailleur
7a6d84f0d5
Merge pull request #19365 from hregis/fix_add_ldap_hash_type_select
NEW add ldap password hash type select
2021-11-15 11:16:33 +01:00
Laurent Destailleur
0227b897d8
Merge pull request #19376 from frederic34/patch-1
adding a translation
2021-11-15 10:41:43 +01:00
Laurent Destailleur
9c493127d5 Fix sync 2021-11-15 10:41:05 +01:00
lmarcouiller
238996b351 Merge branch 'develop#2' of github.com:Hystepik/dolibarr into develop#2 2021-11-15 10:13:27 +01:00
Laurent Destailleur
f086fa6c40 Trans 2021-11-14 18:00:19 +01:00
Frédéric FRANCE
44d81f91e0
adding a translation
found in htdocs/accountancy/index.php
2021-11-13 22:13:06 +01:00
Laurent Destailleur
ec78f21c26 Sync transifex 2021-11-13 15:17:06 +01:00
Regis Houssin
317060d915 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_add_ldap_hash_type_select 2021-11-12 16:53:39 +01:00
Laurent Destailleur
3b21fc2d37 Better way to report value of stock when PRODUIT_MULTIPRICES is on 2021-11-12 10:50:19 +01:00
Regis Houssin
084a3f48c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
fix_add_ldap_hash_type_select
2021-11-12 10:10:04 +01:00
Laurent Destailleur
436dbcd81d Shorter pdf label 2021-11-11 15:22:54 +01:00
Laurent Destailleur
47dd7335a9 Debug v15 2021-11-10 21:34:41 +01:00
Giovanni Vella
78df3f54c4
Merge branch 'Dolibarr:develop' into develop 2021-11-10 13:55:18 +01:00
Frédéric FRANCE
c9517db43b
Update cashdesk.lang 2021-11-10 12:26:28 +01:00
Laurent Destailleur
c858c7bf53 Trans shorter 2021-11-08 14:05:07 +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
Giovanni Vella
e36d2b5398
Merge branch 'Dolibarr:develop' into develop 2021-11-07 21:53:52 +01:00
Laurent Destailleur
969fe16442 Debug mass actions of partnership module 2021-11-07 16:51:18 +01:00
Laurent Destailleur
ed9806576a Trans 2021-11-07 16:07:16 +01:00
Regis Houssin
3fb0e3c5ad NEW add html.formldap.class.php 2021-11-03 22:56:15 +01:00
Alexandre SPANGARO
13123c3370 Permission language key 2021-11-02 05:31:51 +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
John BOTELLA
c28e9f5f7c Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_setup_form_help_class 2021-11-01 10:08:37 +01:00
Laurent Destailleur
58e55a3d86
Merge pull request #19263 from frederic34/displaydnsspf
display spf info from dns
2021-11-01 02:35:32 +01:00
Frédéric FRANCE
8ce70aac5d
display spf info from dns 2021-10-31 18:43:11 +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
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Laurent Destailleur
ffcc6b6d69
Merge pull request #19235 from noec764/14.0_FIX_Error_in_stock_module
FIX: Replenish: SQL error when no warehouse has been created
2021-10-31 14:22:31 +01:00
Laurent Destailleur
480ad63c5d
Update stocks.lang 2021-10-31 14:21:01 +01:00
Laurent Destailleur
4e32859bc3
Merge pull request #19243 from yaroslaw74/patch-1
Requisites
2021-10-31 13:58:25 +01:00
Alexandre SPANGARO
57a479e328 Remove useless language key 2021-10-31 07:27:37 +01:00
Alexandre SPANGARO
70ed633171 Update label perms 2021-10-31 07:23:34 +01:00
Alexandre SPANGARO
84c3c9d025 Remove useless language key 2021-10-31 07:12:26 +01:00
Alexandre SPANGARO
62ce27886b Remove useless language key 2021-10-31 07:04:31 +01:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
Giovanni Vella
badf52b295
Merge branch 'Dolibarr:develop' into develop 2021-10-29 15:35:56 +02:00
Ярослав
9b2a6cc2e7
Requisites
Details of individuals and legal entities for Ukraine
2021-10-29 09:20:52 +03:00
Marc de Lima Lucio
fbb1fbf08e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-10-28 17:09:50 +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
Administrator
44eedb8c6e FIX: Replenish: SQL error when no warehouse has been created + Warning when there are no warehouses 2021-10-28 12:58:14 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modAdherent.class.php
2021-10-28 11:05:38 +02:00
Laurent Destailleur
5df25fece7 Trans and log 2021-10-27 11:15:26 +02:00
Laurent Destailleur
e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:52:00 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:29:47 +02:00
Laurent Destailleur
e5a8e41cd9 Trans 2021-10-26 02:00:11 +02:00
Laurent Destailleur
8076357f93
Merge pull request #17185 from bb2a/formconfirm_notification
[NEW]  Add option for notification in message form
2021-10-24 13:00:39 +02:00
Laurent Destailleur
9cd59bf2c4
Merge pull request #18508 from henrynopo/patch-3
NEW Additional reason for Customer's partial payment - bank fees
2021-10-24 12:54:19 +02:00
Giovanni Vella
037c36abf0
Merge branch 'Dolibarr:develop' into develop 2021-10-24 11:54:48 +02:00
John BOTELLA
fdcb9674d8 Remove prints 2021-10-24 02:09:49 +02:00
Jesús Jerez
fc307fb685
Merge branch 'develop' into canceled_orders 2021-10-23 23:24:47 +02:00
Polkiko
a58f713f6d NEW Canceled purchase orders do not qualify for total in project overview (and are hidden)
If purchase order has been canceled then it does not qualify for total amount and is not shown in table. It can be seen by clicking on the "show/hide" button.
2021-10-23 23:12:23 +02:00
Laurent Destailleur
44b030e23e
Merge branch 'develop' into NEW_stockstransfers 2021-10-23 22:57:35 +02:00
Laurent Destailleur
7f19682724
Merge pull request #18503 from atm-adrien/NEW_develop_sub_BOM
NEW : Sub bill of materials
2021-10-23 18:26:46 +02:00
Lucas Marcouiller
5dfb496bad update import.php to start import to line 2 2021-10-23 17:16:19 +02:00
Giovanni Vella
d624928a5d
Merge branch 'Dolibarr:develop' into develop 2021-10-23 10:56:54 +02:00
Theo
03030685f6 add: quick link categories to account 2021-10-22 17:15:51 +02:00
Theo
f4a48e46ff add: quick link categories to user 2021-10-22 16:54:31 +02:00
Theo
d5fc28f9b5 add: quick link categories to contacts 2021-10-22 16:46:55 +02:00
Theo
a36c966f15 add: quick link categories to adherent 2021-10-22 16:13:54 +02:00
Theo
29f847c13a add: quick link categories to project 2021-10-22 15:48:39 +02:00
Laurent Destailleur
d54423990d
Merge pull request #19077 from polkiko/email_contentlines
FIX Content line substitution in email
2021-10-22 15:37:45 +02:00
Giovanni Vella
c77d1206d3 NEW: receipt beep alternative and current date/time
I have added the alternative command for the beep (when that does not work) and the possibility to print the current date and time on the receipt.
2021-10-22 14:45:28 +02:00
Lucas Marcouiller
daafe652b9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-10-22 14:39:18 +02:00
Polkiko
0c47a88098 FIX Content line substitution in email 2021-10-21 23:53:37 +02:00
Maxime Kohlhaas
860fb21d2d Fix expense report warning display + translations 2021-10-21 23:52:05 +02:00
Theo
2780f30d58 fix: ticket tags/categories edit 2021-10-21 19:05:13 +02:00
Lucas Marcouiller
1f64b09430 WIP : fix inventory scan 2021-10-21 18:07:54 +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
8e68f452ed
Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-10-20 14:48:06 +02:00
Gauthier PC portable 024
4614b0dd65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-20 09:13:58 +02:00
Laurent Destailleur
99a939df57
Merge pull request #17518 from bb2a/add_option_pdf_global_with_picture
[NEW] PDF width picture option
2021-10-19 19:32:44 +02:00
Laurent Destailleur
3a14cd7a16
Update admin.lang 2021-10-19 19:32:28 +02:00
Adrien Raze
b5b7281094 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_sub_BOM 2021-10-19 16:40:02 +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
5e26e2a71a Trans 2021-10-19 10:54:09 +02:00
Laurent Destailleur
252c910962 Debug feature for proposal signature 2021-10-18 20:46:28 +02:00
Jesús Jerez
43ac3230c3
Merge branch 'develop' into payment_receipt 2021-10-18 19:53:36 +02:00
Laurent Destailleur
297580ed11
Merge pull request #19011 from Hystepik/develop#2
NEW: Online proposal signature
2021-10-18 19:41:58 +02:00
Laurent Destailleur
b0230ad42b Look and feel v15 2021-10-18 16:45:14 +02:00
Laurent Destailleur
2262646391 Standardize name of page 2021-10-18 16:04:49 +02:00
lmarcouiller
0c2cf9980d NEW: online propal signature 2021-10-18 14:28:30 +02:00
Laurent Destailleur
e442fcb07e Trans 2021-10-18 12:22:27 +02: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
514bcc87ea Sync transifex 2021-10-17 15:53:29 +02:00
Laurent Destailleur
0aa90e82ea Clean code 2021-10-17 15:47:29 +02:00
Alexandre SPANGARO
fb30136202 Translation 2021-10-17 08:12:28 +02:00
Laurent Destailleur
bbbc58ec02
Update admin.lang 2021-10-16 18:55:34 +02:00
Florian HENRY
26c50b9e2c add setting to create PDF in PDF/A - 1b format #18990 2021-10-15 11:59:12 +02: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
Gauthier PC portable 024
ca18db8f50 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-11 16:01:47 +02:00
Laurent Destailleur
5666c63de2
Merge pull request #18850 from atm-gauthier/NEW/integration_GPEC_code
New : integration gpec, source code
2021-10-11 15:39:54 +02:00
Laurent Destailleur
dc7143cb77
Merge pull request #18919 from OPEN-DSI/new-takepos-receipt-free-label
NEW print without details
2021-10-11 11:23:54 +02:00
Gauthier PC portable 024
fb74d23ae8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-07 13:40:52 +02:00
Gauthier PC portable 024
de48c1bdde Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-07 11:23:37 +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
Gauthier PC portable 024
70648477a7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-07 10:37:09 +02:00
lvessiller
cc21257e3e NEW print without details 2021-10-07 09:51:55 +02:00
Laurent Destailleur
ed6fefc493 Trans 2021-10-07 04:10:39 +02:00
Laurent Destailleur
6cb690e678 Debug v14 2021-10-06 21:56:48 +02:00
Laurent Destailleur
9cf46eaf25 Fix stats graphs 2021-10-06 20:29:48 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
2021-10-06 18:30:26 +02:00
Gauthier PC portable 024
231f809106 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:55:36 +02:00
Laurent Destailleur
7e0ec949c0
Merge pull request #18915 from vincentjdc/vat-number-societe-list
NEW Add `SOCIETE_SHOW_VAT_IN_LIST` to display VAT number in combo list of thirdparties
2021-10-06 15:33:46 +02:00
Laurent Destailleur
a33ca7d528
Update admin.lang 2021-10-06 15:33:06 +02:00
Vincent Dieltiens
2889af9fae Add SOCIETE_SHOW_VAT_IN_LIST option to let the possibility to display (and search) VAT number in list of 'societe' 2021-10-06 15:23:23 +02:00
Laurent Destailleur
de49e4e375
Merge branch 'develop' into NEW_expense_report_project_required 2021-10-06 14:34:58 +02:00
Laurent Destailleur
6b5ab8025c
Update admin.lang 2021-10-06 14:30:47 +02:00
Laurent Destailleur
92ae3c9d52 Fix label in graph 2021-10-06 14:26:48 +02:00
Laurent Destailleur
ff29ac93ad Debug eventorganization modules 2021-10-06 12:43:40 +02:00
Laurent Destailleur
36a00bc1ac Enhance selection of qty to transfer/correct stock 2021-10-05 20:42:52 +02:00
Marc de Lima Lucio
b173832d54 NEW: deposit payment terms: add a 30% deposit example payment term at install/migration 2021-10-05 15:42:40 +02:00
Gauthier PC portable 024
370af17894 FIX : ihm 2021-10-05 15:21:37 +02:00
Marc de Lima Lucio
4059b64288 FIX: deposit payment terms: langs 2021-10-05 13:00:25 +02:00
Gauthier PC portable 024
5d179beaac FIX : several fixes + travis 2021-10-05 11:14:08 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +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
6d8276c9c8 Doc 2021-10-04 12:59:53 +02:00
Laurent Destailleur
91ee704dc3 Move trans from admin to main 2021-10-04 12:16:50 +02:00
Gauthier PC portable 024
73e741ca74 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-04 11:10:38 +02:00
Laurent Destailleur
7b02560c4f Better way to present open invoice graph 2021-10-04 05:27:07 +02:00
Laurent Destailleur
705644bf07
Merge branch 'develop' into NEW_expense_report_prefill_dates 2021-10-02 21:11:59 +02:00
Laurent Destailleur
a5daf9de9d
Update admin.lang 2021-10-02 21:09:03 +02:00
Gauthier PC portable 024
d01460d606 FIX : hrm_position > hrm_job_user + seEventMessage on evaluation close 2021-10-01 08:06:45 +02:00
Marc de Lima Lucio
5f826f78a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-09-30 17:41:38 +02:00
Marc de Lima Lucio
d3e90e8f76 NEW: expense reports: conf to force amounts to be entered only including taxes 2021-09-30 17:24:57 +02:00
Marc de Lima Lucio
0dae918b76 NEW: expense reports: make project field required on lines 2021-09-30 17:09:49 +02:00
Marc de Lima Lucio
c2c7d88520 NEW: NEW: expense reports: conf to pre-fill start/end dates with bounds of current month 2021-09-30 16:40:34 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/opensurvey/card.php
2021-09-30 16:32:40 +02:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
Marc de Lima Lucio
81ddc6c0f6 NEW: deposit payment terms: generate deposit from proposal 2021-09-30 12:41:07 +02:00
Laurent Destailleur
3d239e7528 Trans 2021-09-29 17:28:06 +02:00
Laurent Destailleur
670a80c74c Trans 2021-09-29 16:26:10 +02:00
Marc de Lima Lucio
ef624ec5bc NEW: deposit payment terms: add field into dictionary admin page 2021-09-29 11:34:30 +02:00
Gauthier PC portable 024
eccff256b1 FIX : IHM 2021-09-29 08:30:30 +02:00
Laurent Destailleur
65267920c8 Missing language 2021-09-28 17:25:57 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Laurent Destailleur
0f685853c4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 16:47:39 +02:00
Laurent Destailleur
7c5dfa0ad2 Fix language files 2021-09-28 16:47:09 +02:00
Laurent Destailleur
f9913d2ebc
Merge branch 'develop' into develop#4 2021-09-28 13:21:43 +02:00
Laurent Destailleur
e6e224f33c Better translation 2021-09-28 11:53:00 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Gauthier PC portable 024
fde0f1ac25 NEW : HRM integration, source code 2021-09-27 11:20:38 +02:00
Laurent Destailleur
c90af50585
Merge branch 'develop' into NEW_develop_sub_BOM 2021-09-24 13:39:20 +02:00
Laurent Destailleur
8b7c677121
Merge pull request #18702 from Hystepik/develop#2
Close #18692 : Possibility to move directories in ecm
2021-09-24 13:36:25 +02:00
Laurent Destailleur
70d255740b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/class/task.class.php
2021-09-24 02:33:48 +02:00
Laurent Destailleur
a2a4a74964 Fix trans 2021-09-23 16:18:21 +02:00
Laurent Destailleur
5c4922682c Trans 2021-09-23 13:29:18 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object
NEW : field and behavior in product object
2021-09-23 12:14:09 +02:00
Laurent Destailleur
0a28bf4d30 Trans 2021-09-23 11:44: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
bbd14a5bf3
Merge pull request #18791 from erikvanberkum/develop
Fix translation Error: ConfirmDeleteMO
2021-09-22 15:25:56 +02:00
lmarcouiller
7361941420 Close #18770 : Can enter buying price on line 2021-09-22 14:56:44 +02:00
Erik van Berkum
5d684b1c71 Fix: translation error: ConfirmDeleteMO is not delete this Bill Of Materials but delete this Manufacturing Order. 2021-09-22 10:03:25 +09:00
Laurent Destailleur
b7fadd0307
Merge pull request #18773 from aspangaro/15a18
Missing language key
2021-09-21 19:08:32 +02:00
Laurent Destailleur
97d912d553 Add more information about private or public poll. 2021-09-21 17:17:38 +02:00
ksar
7a6a515386
Missing translations for Inventories 2021-09-21 12:18:37 +02:00
Alexandre SPANGARO
76f7efc193 Missing language key 2021-09-21 03:08:43 +02:00
Laurent Destailleur
d1bfaa5256 Trans 2021-09-20 19:02:04 +02:00
Laurent Destailleur
82f66f8b0a Better label of field 2021-09-20 19:00:28 +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
Laurent Destailleur
be2a95ca51 Add language as_IN 2021-09-20 13:01:53 +02:00
Laurent Destailleur
14c8bdce1a Better desciption of option 2021-09-19 19:25:38 +02:00
Laurent Destailleur
89e8f24e15 Fix CSRF protection for all massactions 2021-09-18 22:38:25 +02:00
Laurent Destailleur
97bb04c5b0
Merge branch 'develop' into NEW_develop_sub_BOM 2021-09-18 16:31:51 +02:00
Gauthier PC portable 024
e6c9627195 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-17 15:47:23 +02:00
Laurent Destailleur
6e3b91f268 Trans 2021-09-17 12:38:06 +02:00
Laurent Destailleur
d5d97e2d24
Merge pull request #18725 from aspangaro/14p16
FIX Accountancy - Some correction on export name
2021-09-17 10:52:48 +02:00
Laurent Destailleur
775544d47d
Merge pull request #18727 from Hystepik/develop#4
Close #18677 : new show articles of KM
2021-09-17 10:51:38 +02:00
Laurent Destailleur
16331ce87b Better detection of company 2021-09-16 18:53:00 +02:00
Florian HENRY
67c468025d add trans 2021-09-16 17:22:22 +02:00
Laurent Destailleur
086754e149 Fix translation of category codes 2021-09-16 14:31:20 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
2021-09-16 13:40:05 +02:00
Laurent Destailleur
0fc51b6564 Fix email content 2021-09-16 12:10:40 +02:00
Laurent Destailleur
b18e0e3d1e Add missing translation key 2021-09-16 12:04:46 +02:00
Alexandre SPANGARO
ed37f9fb7a FIX Accountancy - Some correction on export name 2021-09-16 06:40:43 +02:00
Laurent Destailleur
b18e25db87 Code comment 2021-09-16 03:13:44 +02:00
Laurent Destailleur
c907c6ed08 Fix trans 2021-09-16 02:19:08 +02:00
Laurent Destailleur
51d7622434 Fix trans 2021-09-16 02:18:00 +02:00
lmarcouiller
b26e9be36f Close #18677 : new show articles of KM 2021-09-15 15:36:57 +02:00
Laurent Destailleur
3f2f6c3ed3 Fix online registration 2021-09-14 21:12:11 +02:00
Laurent Destailleur
5f612dfd7c Trans 2021-09-14 17:38:17 +02:00
Laurent Destailleur
283f37a364 Trans 2021-09-13 16:32:24 +02:00
lmarcouiller
324af09415 Close #18692 : Possibility to move directories in ecm 2021-09-13 15:57:21 +02:00
Laurent Destailleur
ce9a10bd90 Fix description of some options 2021-09-13 03:43:25 +02:00
Laurent Destailleur
3ea617ef68 Fix missing trans 2021-09-13 03:07:57 +02:00
Laurent Destailleur
bbacb4e740 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 02:45:00 +02:00
Laurent Destailleur
c005a20cc0 Fix ldap with ssl 2021-09-11 03:27:59 +02:00
Laurent Destailleur
11b6259130 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/langs/en_US/admin.lang
2021-09-10 11:40:45 +02:00
Laurent Destailleur
4939cc9911 Fix trans 2021-09-10 11:04:59 +02:00
Laurent Destailleur
071a2959ab Fix trans 2021-09-10 11:04:49 +02:00
Laurent Destailleur
6a296bf6c2 Debug setup 2021-09-10 10:18:46 +02:00
Laurent Destailleur
7526cb3b8b Fix VAT rate label and add Mali default vat rate 2021-09-10 09:44:06 +02:00
Laurent Destailleur
d382e8d8c9 Clean setup and translation 2021-09-10 09:21:37 +02:00
Laurent Destailleur
875b93aff2
Merge branch 'develop' into 15a8 2021-09-09 19:26:01 +02:00
Laurent Destailleur
caf0559985
Merge pull request #18624 from Hystepik/develop#1
Close #18584 : Code enhancement of MO
2021-09-09 18:54:34 +02:00
Laurent Destailleur
cbe08183ac
Merge pull request #18648 from atm-gauthier/NEW_mass_delete_objects
NEW : mass action delete, no more break if at least one object has child
2021-09-09 14:38:49 +02:00
Laurent Destailleur
dca743142e
Merge pull request #18636 from Hystepik/develop#2
Close #18607 : Implementation of salary button
2021-09-09 14:29:56 +02: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
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
0b68da4e9e Debug organizedeventregistration module 2021-09-08 02:27:52 +02:00
Laurent Destailleur
f5903c9b02 Debug organizedeventregistration module 2021-09-08 02:17:00 +02:00
Laurent Destailleur
880ac07661 Debug organizedeventregistration module 2021-09-08 01:41:59 +02:00
Laurent Destailleur
3cc888f4df Debug event module 2021-09-07 23:19:36 +02:00
Laurent Destailleur
07d48e627e Debug event organization module 2021-09-07 23:19:16 +02:00
Laurent Destailleur
3df005778c Debug event module 2021-09-07 19:48:32 +02:00
Laurent Destailleur
f54e4690e6 Debug event organization module 2021-09-07 18:13:55 +02:00
Laurent Destailleur
32a09e9494 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/salaries/paiement_salary.php
2021-09-07 17:47:00 +02:00
Laurent Destailleur
4e0ae972f1 Fix css 2021-09-07 17:26:31 +02:00
Gauthier PC portable 024
938092d67c NEW : when we delete several objects with massaction, if somes object has child we must see which objects are concerned and nevertheless delete objects which can be deleted 2021-09-07 16:46:48 +02:00
lmarcouiller
0d9280f945 Close #18607 : Implementation of salary button 2021-09-07 10:39:41 +02:00
Laurent Destailleur
e77d7d22a8 Trans 2021-09-06 18:34:18 +02:00
Laurent Destailleur
70d52aca1d Trans 2021-09-06 17:42:17 +02:00
Gauthier PC portable 024
d121544810 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-06 16:08:39 +02:00
lmarcouiller
765f0c4d19 Close #18584 : Code enhancement of MO 2021-09-06 14:56:30 +02:00
jpb
06b9f90383 merge conflict 2021-09-06 09:52:28 +02:00
jpb
65a2486f94 merge conflict 2021-09-06 09:43:52 +02:00
Laurent Destailleur
9aaf11f8cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-06 01:52:34 +02:00
Laurent Destailleur
319a531571 Trans 2021-09-06 01:51:25 +02:00
Laurent Destailleur
b58684af98 Fix trans 2021-09-05 14:31:33 +02:00
Laurent Destailleur
138af805b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-04 14:11:38 +02:00
Laurent Destailleur
87b33c09e0
Merge pull request #18595 from FHenry/14_eventorg
NEW : Can register an attendees on project global (and also on conférence)
2021-09-03 20:50:21 +02:00
Florian HENRY
96f9f8ae98 work on event 2021-09-03 15:40:33 +02:00
Laurent Destailleur
3598816763 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-02 21:05:00 +02:00
Laurent Destailleur
8ea1a9602b NEW Add import / export of MO and BOMLines - Close #18499 2021-09-02 21:00:31 +02:00
henrynopo
6e5258f482 Update stocks.lang 2021-09-02 19:26:32 +02:00
Laurent Destailleur
0c72734c4a
Merge pull request #18536 from henrynopo/patch-14
Fix error of ValidateSending
2021-09-02 19:23:59 +02:00
Laurent Destailleur
cd313d7506 Save type (manufacture/disassemble) on MO. 2021-09-02 15:23:31 +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
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:37:15 +02:00
Laurent Destailleur
c207dde5e1 Fix cancel button 2021-09-01 20:10:56 +02:00
Laurent Destailleur
eaf1379751 Trans 2021-09-01 18:55:27 +02:00
Laurent Destailleur
831a66465f Fix trans 2021-09-01 18:28:21 +02:00
Laurent Destailleur
79a25248cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2021-09-01 17:55:32 +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
Laurent Destailleur
8dd4dae8f8
Merge pull request #18558 from FHenry/dev_more_inv_task_comment
From #18530 display date and duration in invoice generation from task time spent
2021-09-01 16:27:24 +02:00
Alexandre SPANGARO
dbe6861f79 Merge remote-tracking branch 'upstream/develop' into 15a8 2021-09-01 14:09:02 +02:00
Laurent Destailleur
fb0bd41178 Fix trans 2021-09-01 13:02:36 +02:00
Laurent Destailleur
bcd835ddbd Fix tooltips 2021-09-01 12:34:59 +02:00
Laurent Destailleur
a48473ba7a Missing trans exclude 2021-09-01 12:22:44 +02:00
Laurent Destailleur
dad4c34ec5 Debug module conference or booth 2021-08-31 23:51:45 +02:00
lvessiller
6c2cf4377a NEW can enable/disable external calendar by default 2021-08-31 18:14:16 +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
Laurent Destailleur
cceba665a2 NEW Option "Add a link on the PDF to make the online payment" 2021-08-31 12:29:14 +02:00
Florian HENRY
009fa41762 add checkbox to ask detail on line desc 2021-08-31 09:10:57 +02:00
Laurent Destailleur
18e7a5efa9 Trans 2021-08-30 19:00:15 +02:00
Adrien Raze
709a297563 NEW : Allow drag and drop on kits 2021-08-30 14:45:42 +02:00
henrynopo
71f6b472e3
Update stocks.lang 2021-08-29 07:51:29 +08:00
Laurent Destailleur
301d7134b3
Merge branch 'develop' into patch-2 2021-08-28 17:37:54 +02:00
Laurent Destailleur
f825d3fda4 Trans 2021-08-28 13:27:55 +02:00
Laurent Destailleur
c02fb6b9a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 03:15:47 +02:00
Anthony Berton
afccd0b565 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_with_picture 2021-08-26 17:09:08 +02:00
Laurent Destailleur
931f712c5f Fix import gender man/woman, not 0/1 + import of thirdparty for members 2021-08-26 11:55:22 +02:00
Laurent Destailleur
ac2fc9c57f Fix import gender man/woman, not 0/1 + import of thirdparty for members 2021-08-26 11:53:57 +02:00
Alexandre SPANGARO
006481cdff Update dashboard tab 2021-08-26 06:01:51 +02:00
henrynopo
a25580f97c
Update bills.lang 2021-08-26 10:38:53 +08:00
henrynopo
daa34032ff
Update bills.lang 2021-08-26 09:43:02 +08:00
Laurent Destailleur
65629711d0 FIX #18484 2021-08-25 14:53:14 +02:00
Laurent Destailleur
6c71c6f5e5 Fix trans 2021-08-25 14:18:52 +02:00
Laurent Destailleur
169282c82b
Merge pull request #18458 from andreubisquerra/develop
NEW Split Sale in TakePOS
2021-08-24 14:51:08 +02:00
Laurent Destailleur
1cfe165613 Better name for field 2021-08-24 13:34:10 +02:00
Laurent Destailleur
56c314c671 Fix translation 2021-08-24 00:32:20 +02:00
Adrien Raze
6cd92ca829 NEW : Trad + Comments + Adding tooltips for conf 2021-08-23 12:15:09 +02:00
Alexandre SPANGARO
a1d3e21e77 NEW IHM - Include new options to manage dashboard 2021-08-22 05:25:13 +02:00
Laurent Destailleur
58fa0740c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/errors.lang
2021-08-22 01:41:18 +02:00
Laurent Destailleur
4cd5a53b63 FIX Recommended session.cookie_samesite must be 'Lax' not 'Strict'. 2021-08-22 00:44:51 +02:00