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
Anthony Berton
3e432bd56a
Merge branch 'develop' into add_option_pdf_global_sales_rep
2021-11-08 14:26:31 +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
Anthony Berton
ecea9c13ad
Merge branch 'develop' into add_option_pdf_global_sales_rep
2021-09-09 08:27:04 +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
andreubisquerra
a6bdff59c9
Update lang
2021-08-21 22:31:54 +02:00
Florian HENRY
1cc04c54ca
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project
2021-08-21 15:29:32 +02:00
Anthony Berton
5558659472
Merge branch 'develop' into add_option_pdf_global_sales_rep
2021-08-20 16:45:47 +02:00
jpb
ed65bca666
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
2021-08-20 14:06:13 +02:00
Laurent Destailleur
335e1ff405
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-20 12:45:37 +02:00
Adrien Raze
f4d4733b15
NEW : Select for BOM workable + JS to fill it according to the product selected
2021-08-19 15:37:32 +02:00
Anthony Berton
1e0373ed50
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_width_picture
2021-08-19 15:22:23 +02:00
Klaas Oldenburger
0d4badb50b
Update main.lang
...
Change date format to Dutch standards
2021-08-19 08:26:37 +02:00
Gauthier PC portable 024
c56c74bbdd
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-08-18 18:31:11 +02:00
jpb
fcd485f614
merge conflict
2021-08-18 09:16:28 +02:00
Laurent Destailleur
c001fb9555
Clean code
2021-08-17 23:23:15 +02:00
Laurent Destailleur
bbcea38793
Fix phpcs
2021-08-17 21:58:06 +02:00
Laurent Destailleur
59c9c48844
Merge branch 'develop' into new_validation_method_for_common_object
2021-08-17 19:35:36 +02:00
Laurent Destailleur
5d70ce4f99
Merge pull request #18310 from Hystepik/develop#2
...
Close #18302 : Mass action leave requests aproval
2021-08-17 19:23:30 +02:00
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice
...
NEW : mass action paid customer invoice
2021-08-17 19:10:49 +02:00
Laurent Destailleur
e8646c7919
Merge branch 'develop' into PDF_Propal_frame_option
2021-08-17 18:30:37 +02:00
Laurent Destailleur
8eba57f722
Merge branch 'develop' into PDF_Option_show_code_client
2021-08-17 16:51:01 +02:00
Laurent Destailleur
27a580dc95
Merge branch 'develop' into PDF_show_sender_name
2021-08-17 16:41:19 +02:00
Laurent Destailleur
6e7c8677eb
Update admin.lang
2021-08-17 16:40:31 +02:00
Laurent Destailleur
f18f970b08
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 13:52:36 +02:00
Laurent Destailleur
558c716931
Trans
2021-08-17 05:10:30 +02:00
Laurent Destailleur
f51bcf0038
Debug notification module
2021-08-17 03:20:57 +02:00
Laurent Destailleur
4b89a45ade
Trans
2021-08-17 02:16:25 +02:00
Laurent Destailleur
ecb673f15c
Debug default BOM on product
2021-08-16 23:02:55 +02:00
Anthony Berton
7d143c5575
Merge branch 'add_option_pdf_global_with_picture' of https://github.com/bb2a/dolibarr into add_option_pdf_global_width_picture
2021-08-12 10:33:55 +02:00
Anthony Berton
fdd85845ce
erreur save const
2021-08-12 10:27:19 +02:00
jpb
b1cba14718
merge conflict
2021-08-12 09:36:34 +02:00
Laurent Destailleur
bfedd4a04c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-11 20:47:51 +02:00
Laurent Destailleur
23713d1deb
Merge pull request #18328 from lainwir3d/shipment_close_order_on_close
...
NEW #18326 Workflow: Close order on shipment closing.
2021-08-11 20:47:06 +02:00
Laurent Destailleur
8e9d0a567a
Merge pull request #18360 from andreubisquerra/develop
...
NEW Customer Display with TakePOS
2021-08-11 20:00:36 +02:00
Laurent Destailleur
34b53592b8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-08-11 19:44:33 +02:00
Laurent Destailleur
310b5c974b
Fix help
2021-08-11 19:43:12 +02:00
Anthony Berton
32e5b531ba
Merge branch 'develop' into PDF_show_sender_name
2021-08-11 18:38:30 +02:00
Anthony Berton
956bd00c13
CHANGE_CONST_ADD_DOC
2021-08-11 18:37:13 +02:00
Anthony Berton
652cd3afa5
Merge branch 'develop' into PDF_Option_show_code_client
2021-08-11 18:17:58 +02:00
Anthony Berton
0bab31e973
Merge branch 'develop' into PDF_Propal_frame_option
2021-08-11 18:12:02 +02:00
Anthony Berton
c5e8302ba2
Const
2021-08-11 16:18:16 +02:00
Laurent Destailleur
065d7a781e
Merge branch 'develop' into PDF_Add_propal_option_paiment
2021-08-11 15:24:10 +02:00
Anthony Berton
b45a57060f
const_and_other_doc
2021-08-11 12:36:16 +02:00
Anthony Berton
3de055bac2
update
2021-08-11 12:10:17 +02:00
Laurent Destailleur
21df418468
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-10 19:28:44 +02:00
Anthony Berton
be016197b4
Trans
2021-08-10 18:07:11 +02:00
Anthony Berton
bcb58ae6ef
trans
2021-08-10 18:06:35 +02:00
Anthony Berton
2cb7e828a3
Trans
2021-08-10 18:05:58 +02:00
Anthony Berton
69e31e1655
ok
2021-08-10 18:04:59 +02:00
Anthony Berton
6a41edd3c2
ok
2021-08-10 13:02:37 +02:00
Laurent Destailleur
3b73abed7c
css
2021-08-10 11:40:25 +02:00
Anthony Berton
f8df845442
Const and Com
2021-08-10 09:45:15 +02:00
Anthony Berton
3b04c28c4f
const
2021-08-10 09:41:40 +02:00
Anthony Berton
284b40f152
CONST
2021-08-10 09:38:07 +02:00
Anthony Berton
0bead55836
ok
2021-08-09 18:11:36 +02:00
Laurent Destailleur
b5b53e382e
Fix missing template
2021-08-09 18:01:41 +02:00
Anthony Berton
41457d2adb
ok
2021-08-09 17:16:48 +02:00
Laurent Destailleur
591b4c6793
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-09 16:49:16 +02:00
Laurent Destailleur
2de728c074
Fix trans
2021-08-09 16:12:20 +02:00
andreubisquerra
091f5ab23b
Customer Display Lang
2021-08-08 19:12:45 +02:00
Laurent Destailleur
c603dfb5ea
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-05 15:16:04 +02:00
Laurent Destailleur
047bbbb298
NEW Can set/unset the usual working day of the week
2021-08-05 14:42:28 +02:00
Laurent Destailleur
5d717113be
Add language key
2021-08-05 11:20:43 +02:00
Laurent Destailleur
965bdbb342
Trans
2021-08-04 23:08:57 +02:00
jpb
f99ba2c1e1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
2021-08-04 17:26:23 +02:00
Laurent Destailleur
6a31d4657b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-04 13:12:46 +02:00
Laurent Destailleur
bec87f5739
Fix translation ICS
2021-08-04 13:12:07 +02:00
Gauthier PC portable 024
f77b6d87c9
FIX : langs
2021-08-04 09:18:32 +02:00
Laurent Destailleur
ede571dcfe
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-08-03 17:08:49 +02:00
4873a91afc
CLOSE #18326 Workflow: Close order on shipment closing.
...
Allow an order to be closed automatically when all linked shipment have been closed and all products / items have been shipped.
2021-08-03 17:55:28 +04:00
Laurent Destailleur
d0c57dac34
FIx #18217 - Salary - link 'salary' of bank_url not managed
2021-08-03 15:02:09 +02:00
Laurent Destailleur
0058e32207
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/class/html.form.class.php
htdocs/projet/tasks/time.php
2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/accountancy/tpl/export_journal.tpl.php
htdocs/projet/tasks/time.php
2021-08-02 18:31:26 +02:00
Gauthier PC portable 024
b83b77beb5
NEW : stock transfer sheet proforma + default model system like cmd invoice, etc...
2021-08-02 17:28:41 +02:00
lmarcouiller
1cef6d31e8
Close #18302 : Mass action leave requests
2021-08-02 15:45:55 +02:00
Gauthier PC portable 024
a45bab10bd
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-08-02 10:09:18 +02:00
Laurent Destailleur
c6233e4a39
Merge pull request #18165 from trekmorris/patch-3
...
Update opensurvey.lang manually
2021-08-02 00:03:38 +02:00
Laurent Destailleur
7eb8232b75
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-31 17:21:05 +02:00
Laurent Destailleur
bd35d86268
Debug v14
2021-07-31 17:20:48 +02:00
Laurent Destailleur
cb2c7d1485
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-31 17:00:00 +02:00
Laurent Destailleur
6f449cfd6c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-31 16:33:38 +02:00
Laurent Destailleur
9f293066ab
Merge pull request #18206 from Hystepik/develop#2
...
New : Inventory scanner tool implemented
2021-07-31 13:27:18 +02:00
jpb
15578c2ec2
merge conflict
2021-07-30 10:57:04 +02:00
Florian HENRY
510cf36bbd
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg
2021-07-30 09:26:55 +02:00
Laurent Destailleur
9954a0e4bb
Fix status of tickets
2021-07-30 00:40:06 +02:00
Laurent Destailleur
f02dee2e21
Fix test on missing install.lock
2021-07-29 23:47:59 +02:00
Florian HENRY
6f3080c67c
send mail from ConfOrBooth list to attendees or santd company
2021-07-29 19:24:12 +02:00
Florian HENRY
ae5bb956ac
fix invoice in stand registration pb
2021-07-29 17:18:05 +02:00
Gauthier PC portable 024
6d460d78ca
NEW : Stocks transfers objects management
2021-07-29 16:09:07 +02:00
Alexandre SPANGARO
712f0b897d
FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT)
2021-07-28 12:02:45 +02:00
Laurent Destailleur
219a2a860b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/main.inc.php
2021-07-20 23:59:33 +02:00
Laurent Destailleur
dc7ff07517
Fix #huntr7144bb4b-338f-45f0-a70e-088ef1f4c037
2021-07-20 23:54:22 +02:00
jpb
dc90a62d90
add tooltips helper on product card
2021-07-20 15:18:14 +02:00
jpb
1237c5ba55
add msg to formconfirm on propal invoice and commande
2021-07-20 14:46:56 +02:00
lmarcouiller
dd9eb28230
Barcode scanner tool update
2021-07-20 14:43:36 +02:00
jpb
367e839239
change class css and behavior js
2021-07-20 13:56:30 +02:00
jpb
e11afb7da0
add color on date dield and warning on line
2021-07-20 11:23:35 +02:00
jpb
97287af987
add field to object product, add sql
2021-07-19 14:03:03 +02:00
lmarcouiller
b309af0ab8
First push new scan quanty inventory
2021-07-19 13:43:48 +02:00
trekmorris
284627b693
Update opensurvey.lang manually
...
This file is not auto sync from transifex . So update it manually .
2021-07-16 23:55:29 +08:00
Laurent Destailleur
c0d54fe608
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-16 15:03:52 +02:00
Laurent Destailleur
0ccc2d9033
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-16 15:01:11 +02:00
Laurent Destailleur
2fc8a80070
Merge pull request #17883 from marc-dll/develop_NEW_holiday_cron
...
NEW: holiday: handle monthly balance updates with cronjob
2021-07-16 12:48:12 +02:00
Laurent Destailleur
f7ed6c8a0b
Merge pull request #18129 from evarisk-theo/add-ticket-categories-views
...
NEW: ticket categories views
2021-07-16 12:46:14 +02:00
Florian HENRY
63a47112ae
new: #18162
2021-07-16 11:14:30 +02:00
Laurent Destailleur
ce27feda84
Debug v14
...
Fix email collector (Creation of thirparty, set of extrafields)
2021-07-16 00:12:58 +02:00
Laurent Destailleur
638a66fbb9
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
2021-07-14 14:49:06 +02:00
Laurent Destailleur
b552c6b4fe
Fix status color
2021-07-14 14:32:05 +02:00
Laurent Destailleur
0d12f25341
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-13 13:21:50 +02:00
lmarcouiller
35b29481c7
Close #18131 : new massaction for thirdparty
2021-07-13 10:05:38 +02:00
Laurent Destailleur
202ee8340a
FIX #18091
2021-07-12 23:01:34 +02:00
Laurent Destailleur
7533c9e3a5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/interventions.lang
2021-07-12 12:01:53 +02:00
Laurent Destailleur
e989284f14
Fix setup help
2021-07-12 10:50:37 +02:00
evarisk-theo
3bc2dec696
Merge branch 'Dolibarr:develop' into add-ticket-categories-views
2021-07-12 09:10:25 +02:00
Laurent Destailleur
4b2bbd0364
Sync transifex
2021-07-11 20:27:03 +02:00
ATM john
dc3f960ce8
Add validate to module builder
2021-07-11 14:05:26 +02:00
Laurent Destailleur
97ac547fe2
Fix/debug the numbering module to autocalculate a new lot.
2021-07-11 00:44:36 +02:00
Laurent Destailleur
e51e31dc11
Merge pull request #18087 from atm-john/new_modal_btn_option
...
New : Add js confirm modal option to BTN created with dolGetButtonAction
2021-07-09 10:09:08 +02:00
Laurent Destailleur
e83df92359
Trans
2021-07-08 17:25:14 +02:00
Laurent Destailleur
08adb73c6e
Trans
2021-07-08 17:24:05 +02:00
Laurent Destailleur
9d3f7c5cdd
Support fk_parent into dictionary of ticket categories
2021-07-07 18:30:10 +02:00
Laurent Destailleur
ced4ea1314
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/tpl/objectline_view.tpl.php
2021-07-06 15:59:59 +02:00
Laurent Destailleur
ed71888501
Merge pull request #18093 from FHenry/14_deveventorg
...
new: working on conference or booth object and event type #FoundationFunding
2021-07-06 15:05:09 +02:00
Laurent Destailleur
b4b939e1a9
Fix add migration of export/import profile when field name changes
2021-07-06 11:54:32 +02:00
Laurent Destailleur
7dab4ef571
Debug v14
2021-07-06 11:18:09 +02:00
Laurent Destailleur
c901e518a7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 02:11:28 +02:00
Laurent Destailleur
6e24ee48d4
Debug security page
2021-07-06 02:07:58 +02:00
Laurent Destailleur
fe5c4f4a0e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-05 17:04:38 +02:00
Laurent Destailleur
22c45fe7cc
Trans
2021-07-05 15:44:11 +02:00
Florian HENRY
dd3c0ac5ab
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg
2021-07-05 15:17:43 +02:00
Florian HENRY
cb2c10551b
on goign
2021-07-05 15:17:21 +02:00
Laurent Destailleur
383c678200
Trans
2021-07-05 14:09:01 +02:00
ATM john
a709cc583f
Add modal option to btn
2021-07-04 22:59:53 +02:00
Laurent Destailleur
5779a56ae0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-04 21:23:53 +02:00
Laurent Destailleur
0cccfb1cee
Fix phpcs v14
2021-07-04 19:23:04 +02:00
Laurent Destailleur
affe6d9631
Sync transifex
2021-07-03 19:00:58 +02:00
Laurent Destailleur
9b7c0a9246
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-07-03 18:32:31 +02:00
Laurent Destailleur
e35ecdf58d
Fix trans
2021-07-03 17:58:37 +02:00
John BOTELLA
167ae5b0f2
Merge branch 'develop' into new_validation_method_for_common_object
2021-07-02 12:04:14 +02:00
Théo David
110b0fecf5
NEW #18046 Add ticket categories views
2021-07-02 10:05:45 +02:00
Laurent Destailleur
0dce34f527
Fix trans
2021-07-01 19:06:16 +02:00
Laurent Destailleur
664af6ad1f
Fix trans
2021-07-01 18:22:33 +02:00
Laurent Destailleur
4cff865c6b
Trans
2021-06-30 18:22:40 +02:00
Christophe Battarel
27e2c62cab
Merge branch 'develop' into timespent2inter
2021-06-30 10:34:22 +02:00
Laurent Destailleur
02a5755876
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/nl_NL/main.lang
2021-06-29 19:59:51 +02:00
Laurent Destailleur
6196a77e64
Merge pull request #17861 from marc-dll/develop_NEW_project_block_timesheet
...
NEW: project time spent: conf to prevent recording time after X months
2021-06-29 19:53:20 +02:00
Francis Appels
1b7b45d72a
Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2
2021-06-29 16:56:48 +02:00
Francis Appels
051bb3f3ef
Fix some core php8 warnings.
...
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
2021-06-29 16:37:07 +02:00
Laurent Destailleur
24fccc2b72
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-06-29 15:53:22 +02:00
Laurent Destailleur
9b328bd8be
Trans
2021-06-29 15:31:42 +02:00
Christophe Battarel
ef8aaa7fd7
generate intervention from time spent
2021-06-29 15:26:04 +02:00
Francis Appels
4558efdea3
Fix travis, also fixed upstream transifex
2021-06-28 19:21:29 +02:00
lmarcouiller
477b1272e0
Fix CI bot error
2021-06-28 13:30:26 +02:00
Laurent Destailleur
813440bd16
Trans
2021-06-27 18:29:54 +02:00
Laurent Destailleur
6ef08852f3
Transifex sync
2021-06-26 22:51:23 +02:00
Laurent Destailleur
bbc6b9aa1b
Look and feel v14
2021-06-26 16:10:56 +02:00
Laurent Destailleur
e62ed28701
Debug v14
2021-06-26 15:39:52 +02:00
Laurent Destailleur
bc816f253c
Fix tooltip
2021-06-26 02:07:18 +02:00
Laurent Destailleur
2c4fd9e409
Debug ENTREPOT_EXTRA_STATUS
2021-06-24 11:51:10 +02:00
Laurent Destailleur
e23ce0bb97
Trans
2021-06-24 09:57:54 +02:00
Laurent Destailleur
cf28fcc8cd
CSS
2021-06-23 02:22:49 +02:00
Laurent Destailleur
de7df8ad9f
Fix lang
2021-06-22 19:11:58 +02:00
Laurent Destailleur
2f6a91f506
Look and feel v14
2021-06-22 15:25:49 +02:00
Laurent Destailleur
23c0edf854
Merge pull request #17784 from atm-john/new_expedition_warehouse_auto_picking
...
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
2021-06-20 12:55:30 +02:00
Laurent Destailleur
597bdee0bc
Trans
2021-06-20 01:39:07 +02:00
Laurent Destailleur
414b5e612f
Better info on upload size limit
2021-06-19 22:11:16 +02:00
Laurent Destailleur
d1ffd4fcc8
Trans
2021-06-15 13:48:00 +02:00
Laurent Destailleur
347c6ae8a8
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/projet/class/project.class.php
htdocs/projet/list.php
2021-06-14 20:13:27 +02:00
Laurent Destailleur
a79afeaf02
Add info to allow debug of email collector
2021-06-14 19:58:12 +02:00
Laurent Destailleur
e0abbb2525
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-13 16:24:21 +02:00
Laurent Destailleur
48b604e4d5
Merge pull request #17905 from aspangaro/14a26
...
Accountancy - Maxi debug of new functionnality date validation
2021-06-13 16:19:44 +02:00
Laurent Destailleur
c4cba43bad
FIX Broken Access Control reported by Ahsan Aziz.
2021-06-13 16:15:05 +02:00
Laurent Destailleur
497e9edbb2
Trans
2021-06-13 15:17:47 +02:00
Alexandre SPANGARO
53d0909a7c
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-06-12 14:20:00 +02:00
Marc de Lima Lucio
30e0471451
NEW: leave requests: add field into type dictionary to block request if balance is negative
2021-06-10 23:04:56 +02:00
Marc de Lima Lucio
1e7df0ba9f
NEW: holiday: handle monthly updates with cronjob
2021-06-10 21:53:06 +02:00
Laurent Destailleur
c40bc085b2
Fix v14
2021-06-10 00:55:10 +02:00
Laurent Destailleur
e915e3403c
Trans
2021-06-09 13:36:37 +02:00
Laurent Destailleur
997674aebc
Fix trans
2021-06-09 13:15:47 +02:00
Laurent Destailleur
a78d29bb71
Fix trans
2021-06-09 13:05:32 +02:00
Laurent Destailleur
14e3d04e25
Add more info on security page
2021-06-09 13:02:17 +02:00
Marc de Lima Lucio
4c6dfd8d5c
Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop
2021-06-09 11:03:04 +02:00
Marc de Lima Lucio
6733d278d8
NEW: project time spent: conf to prevent recording time after X months
2021-06-08 18:13:18 +02:00
Laurent Destailleur
cac63ddd3f
Add missing translation
2021-06-07 12:16:11 +02:00
Laurent Destailleur
242f8b2544
Debug v14
2021-06-07 01:23:34 +02:00
ATM john
aa94d40ad0
WIP - create validation method for common object
2021-06-06 21:12:03 +02:00
Laurent Destailleur
9f177a0c63
Debug v14
2021-06-06 16:36:41 +02:00
Laurent Destailleur
a1bb7129da
Debug v14
2021-06-06 15:29:49 +02:00
Laurent Destailleur
92b6425ce0
Debug v14
2021-06-05 18:20:07 +02:00
Laurent Destailleur
4695bbbd60
Trans
2021-06-05 12:59:19 +02:00
Laurent Destailleur
be97d66f5b
Look and feel v14
2021-06-05 12:58:14 +02:00
Laurent Destailleur
f55be9fd3a
Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest
...
new: working on conference or booth object and event type #FoundationFunding
2021-06-04 13:12:32 +02:00
Laurent Destailleur
3dd53f58f9
Merge pull request #17759 from Hystepik/develop#1
...
Fix inventory/inventory.php
2021-06-04 12:28:55 +02:00
Laurent Destailleur
bd72edc534
Merge pull request #17760 from Hystepik/develop#2
...
Fix error name of menu knowledge management system
2021-06-04 11:50:46 +02:00
Laurent Destailleur
2586fcd1a3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commandestats.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/holiday/month_report.php
htdocs/product/class/product.class.php
htdocs/product/stock/class/mouvementstock.class.php
htdocs/societe/list.php
2021-06-04 11:20:38 +02:00
ATM john
a7300d01b0
WIP - create validation method for common object
2021-06-03 09:49:07 +02:00
ATM john
a5c2ce1727
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
2021-06-01 08:45:45 +02:00
Laurent Destailleur
0071d63fbb
Fix for ro-md language
2021-05-31 13:35:03 +02:00
lmarcouiller
e3a5abe20e
Fix error name of menu knowledge management system
2021-05-28 10:02:48 +02:00
lmarcouiller
e87d175041
Fix inventory/inventory.php
2021-05-28 09:57:21 +02:00
Laurent Destailleur
7983ce941e
Fix performance page
2021-05-27 01:52:52 +02:00
Laurent Destailleur
f9d6438bae
Debug v14
2021-05-25 23:26:03 +02:00
Laurent Destailleur
f252748dbf
Merge pull request #17343 from atm-gauthier/develop_new_collapse_batch_detail
...
NEW : collapse batch detail
2021-05-25 23:04:50 +02:00
lvessiller
38bd595ebd
NEW translate supplier order menus and button
2021-05-21 14:18:46 +02:00
Dorian Vabre
720a368b29
link ics ok (todo: add name of speaker)
2021-05-20 17:24:27 +02:00
Dorian Vabre
307ab92bc0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest
2021-05-20 16:13:42 +02:00
Florian HENRY
4d7b09ff2a
done
2021-05-20 14:00:43 +02:00
Florian HENRY
62bc6e9e1f
on going
2021-05-20 13:15:32 +02:00
Laurent Destailleur
026cc1b35a
Debug for smartphone
2021-05-19 13:21:09 +02:00
Laurent Destailleur
58ffee193f
Debug v14
2021-05-19 13:07:25 +02:00
Laurent Destailleur
7569275d28
Fix generation of invoice
2021-05-18 13:36:07 +02:00
Laurent Destailleur
cc1f98329d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/product/stock/replenish.php
htdocs/ticket/card.php
htdocs/user/class/api_users.class.php
2021-05-17 19:50:10 +02:00
Laurent Destailleur
0121150e02
Merge pull request #17631 from fappels/14_reception
...
Fix: Add test to delete supplier order if reception exist
2021-05-17 13:22:34 +02:00
Francis Appels
c3bea1b46e
Fix: Add test to delete supplier order if reception exist
2021-05-17 12:00:56 +02:00
Laurent Destailleur
082ae2e627
Fix trans
2021-05-17 11:11:17 +02:00
Laurent Destailleur
2f9a504dce
Fix label
2021-05-17 09:30:09 +02:00
Laurent Destailleur
9eda9c1e21
Enhance setup
2021-05-12 19:55:16 +02:00
Laurent Destailleur
f504cbcec4
Fix log
2021-05-12 19:18:51 +02:00
Laurent Destailleur
75bd440591
Trans
2021-05-12 18:29:02 +02:00
Laurent Destailleur
e2ccacd4a9
Merge pull request #17512 from altairisfr/productcard_traceability_fields
...
Stock product card traceability fields
2021-05-11 21:40:50 +02:00
Laurent Destailleur
b090516a73
Merge pull request #17527 from daraelmin/daraelmin-setup-newmembermorphy
...
Fix missing FORCEMORPHY in new member form setup
2021-05-11 19:52:35 +02:00
Laurent Destailleur
c37ccc10b1
Debug v14
2021-05-11 14:50:04 +02:00
Gauthier PC portable 024
f9afe7e81a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail
2021-05-10 09:17:15 +02:00
Dorian Vabre
05bbb3dbf6
improved welcome msg on suggestbooth/conf pages
2021-05-07 16:39:03 +02:00
Dorian Vabre
c48234409b
added copyright
2021-05-07 16:15:13 +02:00
Dorian Vabre
6111f43946
security fix, id was encoded where it should not be encoded
2021-05-07 14:49:00 +02:00
daraelmin
61786d328f
Update members.lang
2021-05-07 14:09:35 +02:00
daraelmin
c61383baf7
Update members.lang
2021-05-07 14:04:55 +02:00
Dorian Vabre
27cffbddf3
vote page ok
2021-05-07 12:21:15 +02:00
Laurent Destailleur
cc79fc6eee
Lang
2021-05-07 11:30:27 +02:00
Laurent Destailleur
e791f9b863
Debug MRP feature
2021-05-06 21:34:59 +02:00
Laurent Destailleur
a7649a5bc2
Trans
2021-05-06 21:15:20 +02:00
Laurent Destailleur
b8b6919cb0
Fix label of dictionaries
2021-05-06 18:41:27 +02:00
Noé Cendrier
b608038370
Merge branch 'develop' into productcard_traceability_fields
2021-05-06 17:41:11 +02:00
Laurent Destailleur
6019df2dfc
Merge branch 'batch_status_dict' of
...
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict
# Conflicts:
# htdocs/langs/fr_FR/productbatch.lang
2021-05-06 17:29:41 +02:00
Laurent Destailleur
a22d3f8627
Merge pull request #17301 from andreubisquerra/master
...
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
2021-05-06 17:20:46 +02:00
Dorian Vabre
2e7d5e6d46
Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest
2021-05-06 16:48:30 +02:00
Dorian Vabre
295c63468b
wip vote page
2021-05-06 16:32:39 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment
...
new: working on conference or booth object and event type #FoundationFunding
2021-05-06 16:31:30 +02:00
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership
...
Dolibarr partnership
2021-05-06 16:11:13 +02:00
Noé Cendrier
5e57a7173d
Merge branch 'develop' into productcard_traceability_fields
2021-05-06 15:21:48 +02:00
altairis-noe
c1b5d26ca0
reconcile before PR - second take
2021-05-06 15:20:49 +02:00
altairis-noe
b979fad859
reconcile before PR
2021-05-06 15:19:29 +02:00
Dorian Vabre
2f7dd4e807
wip vote page
2021-05-06 14:53:23 +02:00
altairis-noe
2bdea3732d
days in lifetime trans
2021-05-06 14:52:48 +02:00
Dorian Vabre
9c20e92e17
country no longer required for conf, preparation of add_contact to conforbooth (not done, commented) and page name change
2021-05-06 14:06:53 +02:00
altairis-noe
94e485aa06
qc_frequency in days and qcstatus elsewhere
2021-05-05 16:56:25 +02:00
lmarcouiller
020ad5aebe
Add endofline in errors.lang
2021-05-05 16:49:51 +02:00
lmarcouiller
6589bab20a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-05-05 16:48:28 +02:00
lmarcouiller
ed59a8851f
Fix #17501 : Undownloable attached file
2021-05-05 16:48:04 +02:00
Laurent Destailleur
7860464724
Sync transifex
2021-05-05 01:48:21 +02:00
Laurent Destailleur
526235d020
Fix substitution of mix html/nohtml
...
Fix send email reminder for past due date of invoices
More PHPUnit test
2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4
Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership
2021-05-04 10:55:19 +01:00
Laurent Destailleur
b14de0bff7
NEW Can clone a cron job.
2021-05-04 10:56:21 +02:00
Laurent Destailleur
b2901bfae0
Make code simpler
2021-05-04 00:15:06 +02:00
Laurent Destailleur
16f1651d4e
Add missing action events in trigger
2021-05-04 00:04:44 +02:00
Laurent Destailleur
a3431a790a
Merge pull request #17404 from bb2a/doctemplate
...
New Add option for doctemplate
2021-05-03 19:45:40 +02:00
Laurent Destailleur
a36df785b0
Fix lang
2021-05-03 19:20:49 +02:00
Laurent Destailleur
1847180c52
Merge pull request #17449 from mafzalzadeh/develop
...
fixed Persian themes direction to rtl
2021-05-03 15:20:16 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2
...
Close #17271 : Replacement of 2 graphes in /compta/index.php
2021-05-03 13:56:44 +02:00
Laurent Destailleur
d7e445efbd
Better doc
2021-05-03 12:01:26 +02:00
Laurent Destailleur
0aef431c2a
Move language keys
2021-05-02 18:56:40 +02:00
Laurent Destailleur
173ef31ad4
Enhance modulebuilder
2021-05-02 12:15:31 +02:00
Laurent Destailleur
ef734aeb58
Debug module inventory
2021-05-01 16:33:05 +02:00
Laurent Destailleur
575d335374
Debug generation of webp
2021-05-01 15:12:30 +02:00
mafzalzadeh
76f42c9b51
fixed Persian themes direction to rtl
2021-05-01 11:09:34 +04:30
Laurent Destailleur
6c649089b8
Fix trans
2021-04-30 17:24:07 +02:00
Laurent Destailleur
fdef17ef0c
Fix translation
2021-04-30 16:59:58 +02:00
Laurent Destailleur
3ae303758b
Fix trans
2021-04-30 16:49:52 +02:00
Laurent Destailleur
223a06b77d
Clean code
2021-04-30 16:41:41 +02:00
Laurent Destailleur
69511e2706
Debug
2021-04-30 16:15:35 +02:00
Laurent Destailleur
46f41681ff
Debug
2021-04-30 15:55:28 +02:00
Laurent Destailleur
67fd5477c9
Merge pull request #17427 from Hystepik/develop#4
...
New Module Knowledge Management
2021-04-30 12:12:15 +02:00
Laurent Destailleur
195163b81a
Enhance security center
2021-04-30 11:45:45 +02:00
altairis-noe
f3ede35b4f
lang correction
2021-04-29 13:18:14 +02:00
altairis-noe
38bba5dddc
Merge branch 'develop' into batch_status_dict
2021-04-29 13:13:41 +02:00
altairis-noe
b04afc1753
merge conflict resolution
2021-04-29 13:08:24 +02:00
altairis-noe
762f41ea86
llx_c_productbatch_qcstatus as dictionnary name
2021-04-29 12:49:15 +02:00
Laurent Destailleur
655056ed31
Debug v14
2021-04-29 12:10:55 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment
2021-04-29 10:31:43 +02:00
Laurent Destailleur
de8e291c7e
Debug v14
2021-04-29 10:01:10 +02:00
lmarcouiller
6da32015f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-04-29 09:45:30 +02:00
Anthony Berton
bb5a11ff75
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/17185
2021-04-29 00:06:35 +02:00
Anthony Berton
c1e6109c4b
Update
2021-04-29 00:03:16 +02:00
Anthony Berton
d3053c0c1b
delete_fr_lang
2021-04-28 23:35:47 +02:00
Anthony Berton
5d17e26738
add_pdf_template_and_read_if_module_activate
2021-04-28 23:25:03 +02:00
Laurent Destailleur
64374f46da
Debug v14
2021-04-28 23:01:20 +02:00
Laurent Destailleur
d4651c4721
Fix trad
2021-04-28 18:32:49 +02:00
Laurent Destailleur
2dc597f5d0
Make setup easier to understand
2021-04-28 18:04:00 +02:00
Laurent Destailleur
2738985689
Fix translation
2021-04-28 17:53:05 +02:00
Laurent Destailleur
6ff9a3c922
Fix trans
2021-04-28 17:13:43 +02:00
lmarcouiller
97043ca665
New module KnowledgeManagement
2021-04-28 14:57:49 +02:00
lmarcouiller
be22d43c60
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-04-28 09:24:18 +02:00
Laurent Destailleur
3f7f166fb6
Make option label easier to understand.
2021-04-27 19:33:11 +02:00
altairis-noe
1a52ff6990
language strings
2021-04-27 17:38:32 +02:00
Dorian Vabre
54b5a43006
wip
2021-04-27 17:06:25 +02:00
lmarcouiller
a499f8f1f8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-04-27 16:26:06 +02:00
lmarcouiller
52bf0f0359
Close #17271 : Replament of 2 graph in compta/index.php
2021-04-27 16:02:46 +02:00
Dorian Vabre
8fc45da56e
Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest
2021-04-27 15:01:59 +02:00
Dorian Vabre
fab12bc5e5
removed the indicated id of conf when on the subscription page for security (now showing label instead)
2021-04-27 14:04:08 +02:00
Dorian Vabre
a508cdbf59
every dol_encode for securekey replaced with dol_hash (dol_encode kept for encoding ids
2021-04-27 14:01:44 +02:00
Dorian Vabre
b24b297a40
adaptation of the payment for the booth location case
2021-04-27 12:30:49 +02:00
Dorian Vabre
151819b7ad
added payment redirection to pay a booth, or status update for free booth/conference
2021-04-27 11:22:40 +02:00
Laurent Destailleur
0d391ec185
Show name of sitemap file
2021-04-27 11:20:04 +02:00
Gauthier PC portable 024
ed8b9fda13
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail
2021-04-27 09:28:08 +02:00
Anthony Berton
6353084777
init
2021-04-27 00:22:39 +02:00
Laurent Destailleur
bc0f220ee3
Fix web site
2021-04-25 22:02:28 +02:00
Laurent Destailleur
2fd2c67139
Clean edit of user card
2021-04-25 15:21:31 +02:00
Dorian Vabre
e81637b608
wip on getting the existing attendee
2021-04-21 16:37:02 +02:00
Dorian Vabre
9809179aa4
securekey added to newpayment page, correction in the invoice line created
2021-04-21 14:19:07 +02:00
Dorian Vabre
4c57a6c207
wip on mail, sending ok but no content
2021-04-20 17:28:18 +02:00
altairis-noe
f1d68c201b
conflict resolution
2021-04-20 16:56:15 +02:00
altairis-noe
d340e21cb3
No translation for dictionary labels
2021-04-20 16:13:36 +02:00
altairis-noe
07cd751c59
batch status dictionnary
2021-04-20 15:51:02 +02:00
Laurent Destailleur
455d5233e6
Fix trans
2021-04-20 11:58:51 +02:00
Laurent Destailleur
f1f63cd4e2
Enhance detection of update available
2021-04-20 11:56:26 +02:00
Gauthier PC portable 024
70f739b332
Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail
2021-04-20 10:03:20 +02:00
Gauthier PC portable 024
72ea2a56ea
NEW : help text
2021-04-20 10:02:53 +02:00
Gauthier PC portable 024
cbfb2d9b47
Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail
2021-04-20 09:44:24 +02:00
Laurent Destailleur
39654260d6
Sync transifex
2021-04-20 00:45:48 +02:00
Laurent Destailleur
0ac380f23e
Merge pull request #17248 from altairisfr/batch_mask_product
...
Batch mask product
2021-04-19 22:16:22 +02:00
Laurent Destailleur
ee9c823c33
Merge pull request #17279 from aspangaro/14a38
...
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
2021-04-19 21:42:13 +02:00
Laurent Destailleur
e71e5d533d
Fix HTML5
2021-04-19 21:30:25 +02:00
Laurent Destailleur
c966914f67
Merge branch 'develop' into new/check_update_for_module
2021-04-19 21:26:01 +02:00
Dorian Vabre
128dcb2e2b
public registration page for booths and conferences created, wip
2021-04-19 17:26:01 +02:00
NextGestion
7cab4dd19d
Manage partnership for members & code optimisation
2021-04-19 15:17:57 +01:00
Dorian Vabre
9a32526938
added space for the link to the conference/booth registration page
2021-04-19 15:49:51 +02:00
Laurent Destailleur
2cd9289de1
Fix error message
2021-04-19 15:09:13 +02:00
NextGestion
ea97cf5baf
Change translate file
2021-04-19 13:46:21 +01:00
Gauthier PC portable 024
894eb1e5a4
NEW : "+" and "-" to show / hide batch details on product "stock" tab
2021-04-19 14:34:11 +02:00
NextGestion
263e110ca3
Enhance module Member
2021-04-19 13:19:32 +01:00
Laurent Destailleur
379f105e4c
Trans
2021-04-19 14:18:41 +02:00
Dorian Vabre
701b53773b
added description of the line in the invoice, problem with dates that are int
2021-04-19 09:54:29 +02:00
Alexandre SPANGARO
305b338a11
Update notified
2021-04-19 06:03:03 +02:00
Alexandre SPANGARO
7c0350e948
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-04-19 06:02:26 +02:00
Laurent Destailleur
a1acc896e2
Accept several sizes for favicon
2021-04-18 23:25:47 +02:00
ATM john
7794927a64
New check update for modules
2021-04-18 20:12:24 +02:00
Alexandre SPANGARO
510f387a80
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-04-18 07:49:48 +02:00
NextGestion
5a8742b3eb
Cancel Partnership For Expired Members & Warning of partnership if Dolibarr backlink not found on partner website
2021-04-17 13:25:28 +01:00
NextGestion
87bcb212df
Merge branch 'develop' into dolibarr_partnership
2021-04-17 13:51:21 +01:00
Laurent Destailleur
0d8a354934
Set default length of password to 12 car.
...
FIX #yogosha5855
2021-04-17 03:11:58 +02:00
jove@bisquerra.com
712e1c4e7c
NEW Edit sales lines rights in TakePOS
2021-04-17 01:06:30 +02:00
Laurent Destailleur
9eaf836c8e
Merge pull request #17281 from altairisfr/warehouses_in_project
...
Warehouses in project
2021-04-16 20:29:21 +02:00
NextGestion
f784114176
Add email template for accepted partnership
2021-04-16 13:53:12 +01:00
NextGestion
22ec79d03c
Code optimisation
2021-04-16 12:10:26 +01:00
NextGestion
ba93ccaa01
Decline reason for partnership management
2021-04-16 10:56:01 +01:00
NextGestion
0d4a1d061a
Merge branch 'develop' into dolibarr_partnership
2021-04-16 11:01:08 +01:00
NextGestion
9304b3c474
Manage mass action "Send email" for Partnership module
2021-04-16 09:54:11 +01:00
Dorian Vabre
2cbe5b188e
wip invoice
2021-04-15 16:57:41 +02:00
Laurent Destailleur
bf547cf20d
Debug v14
2021-04-15 14:33:48 +02:00
NextGestion
e8fc6fe293
Code optimization
2021-04-15 11:21:33 +01:00
Dorian Vabre
dd7c09582f
payment page structure ok, still need to confirm the attendee after the payment
2021-04-15 10:45:44 +02:00
altairis-noe
3fe0eb54c7
association of warehouses to projects
2021-04-15 09:59:08 +02:00
Alexandre SPANGARO
1be8bfe5c0
Text
2021-04-15 06:08:41 +02:00
Alexandre SPANGARO
b2a1b06736
text
2021-04-14 23:19:10 +02:00
Alexandre SPANGARO
957968eea2
typo
2021-04-14 23:17:26 +02:00
Alexandre SPANGARO
140f098c79
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
2021-04-14 23:16:30 +02:00
Laurent Destailleur
195d3b578b
Fix phpcs
2021-04-14 20:44:34 +02:00
Laurent Destailleur
59f1270264
Trans
2021-04-14 19:12:25 +02:00
Laurent Destailleur
63d4d83025
Better text
2021-04-14 15:15:52 +02:00
NextGestion
4e45011e45
Manage Partnership for third-party
2021-04-14 13:59:38 +01:00
Dorian Vabre
55afc59db2
removed useless fetch, moved link to the fetch method of the conferenceorbooth class, wip on service to use on the invoice
2021-04-14 14:33:11 +02:00
Christophe Battarel
ccc05a0a43
Merge branch 'develop' into batch_mask_product
2021-04-14 08:30:19 +02:00
Laurent Destailleur
033a243372
Merge pull request #17166 from altairisfr/product_masks
...
Product masks
2021-04-13 23:06:09 +02:00
Laurent Destailleur
192fcb89d2
Merge pull request #17097 from NextGestion/dolibarr_partnership
...
Create Partnership Module
2021-04-13 16:33:54 +02:00
Laurent Destailleur
3f159fa39f
Merge pull request #17251 from DorianVabre/dev_EventOrganizer
...
Dev event organizer: public registration page to a conference
2021-04-13 15:31:40 +02:00
Dorian Vabre
fa47106ed7
Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment
2021-04-13 12:21:27 +02:00
Laurent Destailleur
3439bc4a0f
Clean code
2021-04-13 11:30:23 +02:00
altairis-noe
eee40a1840
Merge branch 'develop' of github.com:altairisfr/dolibarr into batch_mask_product
2021-04-13 10:36:37 +02:00
altairis-noe
f69ccbbab8
remove empty line
2021-04-13 10:31:24 +02:00
Laurent Destailleur
0d136d6806
Enhance barcode scanner tool
2021-04-13 10:24:57 +02:00
Laurent Destailleur
7004747ca3
Add more tooltips on edition of accounting account
...
Fix setup of accountancy
Conflicts:
htdocs/accountancy/admin/account.php
2021-04-13 09:51:17 +02:00
Laurent Destailleur
2f77181781
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-13 09:47:18 +02:00
Laurent Destailleur
243fcb38ba
Add more tooltips on edition of accounting account
...
Fix setup of accountancy
2021-04-13 09:46:50 +02:00
Dorian Vabre
167da1445d
securekey added in
2021-04-12 17:16:24 +02:00
Dorian Vabre
358a2bf365
hardcoded label put in ->trans
2021-04-12 17:10:57 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer
...
new: working on conference or booth object and event type #FoundationFunding
2021-04-12 16:06:13 +02:00
Dorian Vabre
15d103e957
subs validation for free conferences added
2021-04-12 15:52:49 +02:00
Christophe Battarel
855e736d32
Merge branch 'develop' into product_masks
2021-04-12 11:42:23 +02:00
Laurent Destailleur
35d37c75fc
Fix EN Translation
2021-04-11 22:25:22 +02:00
Laurent Destailleur
04081954b1
Fix translation
2021-04-11 22:19:15 +02:00
Laurent Destailleur
3893c69dc1
Enhance perf and security page
2021-04-11 21:30:41 +02:00
Alexandre SPANGARO
451164ba64
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-04-10 21:44:23 +02:00
NextGestion
2035b956a6
Fix Sql & translate files
2021-04-10 10:57:23 +01:00
Dorian Vabre
b3415f9031
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer
2021-04-09 16:23:42 +02:00
Dorian Vabre
a590f945e9
thirdparty creation OK, wip on conforboothattendee creation
2021-04-09 16:12:25 +02:00
lmarcouiller
19ee78e123
Close #17193 : Move button convert in webp
2021-04-09 15:44:47 +02:00
altairis-noe
000342c2d8
custom masks : create, edit and display
2021-04-09 13:40:37 +02:00
Laurent Destailleur
a50b0e7441
Debug inventory module
2021-04-09 13:15:27 +02:00
NextGestion
d6e4cb7d0b
Merge branch 'develop' into dolibarr_partnership
2021-04-09 12:01:44 +01:00
Laurent Destailleur
06a7b8f5cb
Merge pull request #17159 from Hystepik/develop#1
...
Close #17145 : add link to autofill with expected qty
2021-04-09 12:50:33 +02:00
Laurent Destailleur
44ec5ad12f
Merge pull request #17194 from daraelmin/daraelmin-amountbymebertype
...
NEW option to select membership type on the online payment page for membership subscription or renewal
2021-04-09 12:35:04 +02:00
Laurent Destailleur
afca96a8ee
Enhance barcode scanner tool
2021-04-09 12:08:56 +02:00
daraelmin
f2a49ef72f
New option amount by member type
2021-04-09 02:23:22 +02:00
Dorian Vabre
60341e8a14
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer
2021-04-08 17:29:16 +02:00
Dorian Vabre
af5b623b59
securekey added
2021-04-08 16:32:50 +02:00
Laurent Destailleur
5fd9ee20eb
Merge branch 'develop' into develop#4
2021-04-08 15:42:07 +02:00
Laurent Destailleur
638a4a6194
Merge pull request #17161 from Hystepik/develop#3
...
Close #17108 : New button to convert images in webp format
2021-04-08 14:06:45 +02:00
Anthony Berton
f613688b28
add_option
2021-04-08 13:37:09 +02:00
Dorian Vabre
c6d3510e30
form ok, todo : creation of an attendee
2021-04-07 17:16:26 +02:00
Christophe Battarel
05efc85008
Merge pull request #2 from altairis-noe/product_masks
...
Product masks
2021-04-07 16:20:39 +02:00
Florent Peyraud
7be9a98ef0
Add bill tax code article for non profit organization VAT
2021-04-07 13:51:08 +02:00
NextGestion
ace958240d
Merge branch 'develop' into dolibarr_partnership
2021-04-07 12:30:37 +01:00
lmarcouiller
843882c7c7
update stock.lang
2021-04-07 12:46:51 +02:00
lmarcouiller
41db9abff8
Close #17145 : add link to autofill with expected qty
2021-04-07 12:46:28 +02:00
Dorian Vabre
07e018dc7d
work in progress
2021-04-07 12:30:08 +02:00
lmarcouiller
0611db68cf
add of tooltip
2021-04-07 11:21:41 +02:00
lmarcouiller
49b3970700
Close #17113 : Can upload a favicon in website module
2021-04-07 11:13:14 +02:00
altairis-noe
fc76e06058
Better tooltip, better name, translation
2021-04-07 10:25:30 +02:00
Laurent Destailleur
4ccb27ad40
Work on inventory module
2021-04-07 02:24:15 +02:00
Laurent Destailleur
0219a18a5c
trans
2021-04-07 01:27:56 +02:00
Laurent Destailleur
d1df327284
Add tab for import/export profiles
2021-04-06 18:51:43 +02:00
Laurent Destailleur
38f3693fc7
Look and feel v14
2021-04-06 18:18:07 +02:00
Laurent Destailleur
10fb793fb1
Enhance the security page
2021-04-06 13:56:33 +02:00
Laurent Destailleur
767aa605a2
Enhance security page
2021-04-06 13:09:00 +02:00
lmarcouiller
c04387ff3b
Close #17108 : New button to convert images in webp format
2021-04-06 11:52:04 +02:00
Laurent Destailleur
2da5d8838d
Fix trans
2021-04-05 15:47:35 +02:00
Laurent Destailleur
5769701cd0
Better example
2021-04-05 15:05:21 +02:00
Laurent Destailleur
37db3ffb90
Merge pull request #17065 from Hystepik/develop#1
...
Debug feature to import stock movement from csv file
2021-04-04 01:41:14 +02:00
NextGestion
6cac5f2212
Create Partnership Module
2021-04-03 09:24:07 +01:00
Laurent Destailleur
06078f231b
NEW Can show the project ref or label into PDF documents
2021-04-01 13:02:44 +02:00
lmarcouiller
fd6822b202
Debug feature to import stock movement
2021-04-01 09:34:14 +02:00
Laurent Destailleur
6fc70fba8c
Merge pull request #16981 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-31 22:29:39 +02:00
Laurent Destailleur
55741506c8
Merge pull request #17053 from aspangaro/14a30
...
NEW: Accountancy - Add FEC import
2021-03-31 22:15:26 +02:00
Laurent Destailleur
0fd36d96f3
Fix report
2021-03-31 21:25:01 +02:00
Florian HENRY
73d7eefdcf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-31 20:09:44 +02:00
Laurent Destailleur
2af8b7078c
Fix turnover calculation was wrong. We must include only
2021-03-31 19:50:43 +02:00
Laurent Destailleur
05d9140f8f
Look and feel
2021-03-31 15:28:12 +02:00
Laurent Destailleur
213544e4a7
Fix text
2021-03-31 15:26:34 +02:00
Laurent Destailleur
3face8b1c4
Debug feature to import stock movements from a file.
2021-03-31 15:15:07 +02:00
Laurent Destailleur
fafff6d9a4
Debug feature to import stock movements from a file.
2021-03-31 15:07:18 +02:00
Laurent Destailleur
66385d4ed5
Merge pull request #17059 from Hystepik/develop#3
...
new mass stock transfer with an import file
2021-03-31 14:02:17 +02:00
Hystepik
69c47f1d39
Merge branch 'develop' into develop#3
2021-03-31 12:21:28 +02:00
lmarcouiller
633b8f1431
Close #16761 : Info template import
2021-03-31 12:18:31 +02:00
lmarcouiller
bd092cc84d
Close #16761 : new mass stock transfer
2021-03-31 12:04:37 +02:00
lvessiller
4e1b84af45
NEW translate in "en_US" to complete PR 16980
2021-03-31 08:27:27 +02:00
Alexandre SPANGARO
9b65529fc7
NEW: Accountancy - Add FEC import
2021-03-31 04:59:12 +02:00
Laurent Destailleur
38f1710b43
Merge pull request #17020 from Hystepik/develop#1
...
Close #4951 : New module Inventory
2021-03-30 20:43:52 +02:00
Laurent Destailleur
12f14f8bd5
Merge pull request #17021 from bb2a/add_option_warehouse_affect_thirparty
...
ADD Option warehouse affect thirparty
2021-03-30 19:47:19 +02:00
Anthony Berton
96b450a849
20210330
2021-03-30 14:58:47 +02:00
lmarcouiller
55560b7d38
Inventory module working
2021-03-30 12:35:20 +02:00
lvessiller
85fff685db
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user
2021-03-30 08:19:54 +02:00
lvessiller
d0ce60ff49
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user
2021-03-30 08:04:19 +02:00
Florian HENRY
11dcf656c6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 20:30:31 +02:00
Laurent Destailleur
715490be0b
Merge pull request #16929 from aspangaro/14a28
...
NEW: Add company info in dropdown login menu
2021-03-29 19:02:12 +02:00
Florian HENRY
e18c010490
fix bug on list
2021-03-29 16:25:34 +02:00
Florian HENRY
f25360cc4c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 15:49:43 +02:00
lmarcouiller
966d3a6f30
add setrecorded and commit to db
2021-03-29 15:18:34 +02:00
Laurent Destailleur
6bc56b7671
Look and feel v14
2021-03-29 13:41:28 +02:00
Laurent Destailleur
b929641fe1
Look and feel v14
2021-03-29 13:00:17 +02:00
Florian HENRY
5fe6aa429d
Merge branch 'dev_EventOrganisation_draft' into dev_EventOrganisation
2021-03-29 12:08:02 +02:00
Florian HENRY
2def98809c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 11:55:26 +02:00
Laurent Destailleur
a2c2d46e5c
Fix loosing html content in edit
2021-03-27 15:22:48 +01:00
Laurent Destailleur
ef4f8fd585
Lang
2021-03-27 14:02:30 +01:00
Alexandre SPANGARO
c1ceefb70f
Update with new functionality
2021-03-27 04:44:20 +01:00
Alexandre SPANGARO
6809dab2c0
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-27 04:12:15 +01:00
Florian HENRY
aa9d4342cd
fix translation
2021-03-26 20:18:22 +01:00
Florian HENRY
7a6cc742a6
fix translation
2021-03-26 19:57:20 +01:00
Florian HENRY
6399423526
fix translation
2021-03-26 19:56:06 +01:00
Florian HENRY
47675d28d7
add filter for select list attendees
2021-03-26 19:47:48 +01:00
Florian HENRY
a254bbcc02
fix translation
2021-03-26 19:05:55 +01:00
Florian HENRY
a8b486c7b9
fix error translation
2021-03-26 19:00:56 +01:00
Florian HENRY
f87711bf2f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-26 18:30:08 +01:00
lvessiller
8a2e49d6e7
NEW date and user signature on proposal (Issue 16062)
2021-03-26 17:44:41 +01:00
Laurent Destailleur
77bb5b78b6
Show swagger json file of APIs
2021-03-26 13:57:16 +01:00
Laurent Destailleur
ff52b1ee41
Merge pull request #16620 from altairisfr/pr_batch_masks
...
Define Masks for Batch Products Equipments
2021-03-25 08:36:36 +01:00
Laurent Destailleur
57662e60a4
Better explanation of internal/external user
2021-03-25 02:11:54 +01:00
Laurent Destailleur
eeba9e4d50
Code comment
2021-03-24 21:58:06 +01:00
Laurent Destailleur
965ee16270
Fix typo
2021-03-24 21:53:56 +01:00
Laurent Destailleur
21a9779fe2
FIX inconsistency in margin recording with option "Force to sale price"
2021-03-24 21:49:45 +01:00
Florian HENRY
373a52063d
add commit
2021-03-24 20:13:30 +01:00
Alexandre SPANGARO
34abb53c25
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-24 14:09:46 +01:00
Laurent Destailleur
4015f5952e
Look and feel v14
2021-03-24 12:51:14 +01:00
Laurent Destailleur
37c04b794f
Add property "ticket group is public" in dicitonary of ticket groups.
2021-03-24 12:13:23 +01:00
Laurent Destailleur
367ff3c9f0
Look and feel v14
2021-03-24 01:53:08 +01:00
Florian HENRY
ebe0b503f6
working on attendees
2021-03-23 22:12:20 +01:00
Florian HENRY
d043c8f4ba
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-23 21:05:11 +01:00
Florian HENRY
cc78e7c685
add field on conf or booth tabs
2021-03-23 21:04:38 +01:00
Laurent Destailleur
053fe4831a
Fix translations
2021-03-23 16:59:12 +01:00
Florian HENRY
edf7c02dd6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-23 11:45:24 +01:00
Florian HENRY
bc1a412d1b
ongoing
2021-03-23 11:45:17 +01:00
Laurent Destailleur
e3b019f923
Clean code
2021-03-23 01:32:17 +01:00
Laurent Destailleur
df9546662a
Fix trans
2021-03-22 16:18:31 +01:00
Laurent Destailleur
897d653144
Debug default date for vat reports
2021-03-22 16:09:18 +01:00
Alexandre SPANGARO
98e482de71
Add text for popup
2021-03-22 06:53:09 +01:00
Laurent Destailleur
f1fb7e732e
Fix trans
2021-03-22 00:07:35 +01:00
Alexandre SPANGARO
17e0cc4bad
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-21 22:59:41 +01:00
Alexandre SPANGARO
ea938f64da
NEW: Add company info in dropdown login menu
2021-03-21 22:58:21 +01:00
Laurent Destailleur
e16b7fe1ee
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-21 21:29:23 +01:00
Laurent Destailleur
c69ad6ee8b
Update setup page
2021-03-21 21:29:11 +01:00
Laurent Destailleur
0f9b88d828
Merge pull request #16899 from daraelmin/daraelmin-status-exclu
...
Close #16255 Add new status "excluded" in membership management module
2021-03-21 20:56:07 +01:00
Laurent Destailleur
3c8bf2167b
Debug permissions
2021-03-21 18:01:43 +01:00
daraelmin
054864eccc
Merge branch 'develop' into daraelmin-status-exclu
2021-03-21 14:42:01 +01:00
daraelmin
e910810037
activate exlcude button
2021-03-21 14:38:15 +01:00
Laurent Destailleur
af199189b3
NEW Add color and picto for direction of movement
2021-03-21 13:46:01 +01:00
Laurent Destailleur
5ecef1bad3
Merge pull request #16739 from altairisfr/pr_searchbatch
...
NEW Add search on lots or serials into quick search bar
2021-03-18 23:43:23 +01:00
Laurent Destailleur
46972ec669
FIx #5660
2021-03-18 14:34:44 +01:00
Frédéric FRANCE
29f55fbeac
fix typo
2021-03-16 17:12:31 +01:00
Christophe Battarel
f59c19b573
search on lots or serials
2021-03-16 16:50:59 +01:00
Laurent Destailleur
8246eb814b
Enhance the page for security advices
2021-03-16 16:02:15 +01:00
Florian HENRY
17c49e6ce9
ongoinf card and list
2021-03-15 18:06:23 +01:00
Laurent Destailleur
85eaec48e1
Merge pull request #16307 from aspangaro/14a15
...
NEW: VAT report - Optimisation & collapse by rate
2021-03-15 11:56:06 +01:00
Christophe Battarel
090dc4f28a
Merge branch 'develop' into pr_batch_masks
2021-03-15 11:42:33 +01:00
Laurent Destailleur
a79c9a9019
Fix help of an option
2021-03-12 12:07:38 +01:00
Christophe Battarel
ba51c5dc70
differentiate masks for lot management and serial numbers management
2021-03-11 10:44:55 +01:00
Laurent Destailleur
8bdc80918b
trans
2021-03-10 18:57:24 +01:00
Laurent Destailleur
c2200e6ffd
Clean code
2021-03-10 16:41:48 +01:00
Laurent Destailleur
514a9fb96a
Merge pull request #16561 from Hystepik/develop#1
...
Close #15917 : Improvement to ticket module
2021-03-10 15:49:20 +01:00
Laurent Destailleur
9ed128c6fa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/class/html.formaccounting.class.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
htdocs/langs/en_US/errors.lang
htdocs/product/card.php
2021-03-10 15:35:09 +01:00
Laurent Destailleur
680f6257a0
FIX warning if setup of chart of account is not yet done.
2021-03-10 11:04:28 +01:00
Laurent Destailleur
a79a4e876d
Merge branch 'develop' into boxindex
2021-03-08 16:34:05 +01:00
lmarcouiller
b71a8c5d6f
Close #15917 : boxes on ticket index
2021-03-08 15:26:35 +01:00
lmarcouiller
d8a74bad93
update for continuous integration
2021-03-08 13:58:23 +01:00
lmarcouiller
8c7764ed5d
Move of 2 graph in boxes
2021-03-08 12:18:55 +01:00
Laurent Destailleur
c0e0300eb3
Enhance the page security
2021-03-08 11:08:58 +01:00
lmarcouiller
f627637490
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-03-08 10:15:00 +01:00
Alexandre SPANGARO
2f86971f84
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-03-08 09:56:57 +01:00
Laurent Destailleur
315e66aa5a
Merge pull request #16537 from altairisfr/pr_sn_unicity
...
Unique serial number management
2021-03-06 11:22:44 +01:00
Laurent Destailleur
cbd6357f45
Merge pull request #16556 from marc-dll/NEW_ldap_group_filter
...
NEW: LDAP: usergroup search can be filtered
2021-03-06 11:08:24 +01:00
Laurent Destailleur
3cbced439a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/compta/bank/line.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/paiement/cheque/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/ticket.lib.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/core/tpl/extrafields_view.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/cron/list.php
htdocs/expedition/card.php
htdocs/mrp/mo_list.php
htdocs/product/stock/productlot_card.php
htdocs/public/emailing/mailing-read.php
htdocs/public/emailing/mailing-unsubscribe.php
htdocs/ticket/list.php
test/phpunit/FactureRecTest.php
2021-03-05 19:29:09 +01:00
lmarcouiller
7ab1e0d9a0
Fix #15917 : Improvement to ticket module
2021-03-05 14:28:23 +01:00
Marc de Lima Lucio
f731545af4
NEW: ldap: filter search on usergroups
2021-03-05 11:14:21 +01:00
Laurent Destailleur
83df996bc2
Fix english translation
2021-03-05 09:52:25 +01:00
Christophe Battarel
acea36acf2
better check for unicity
2021-03-05 08:39:30 +01:00
Laurent Destailleur
aee6d78928
Debug split of payment salary into salary + payment
2021-03-04 21:33:29 +01:00
Laurent Destailleur
b92bfb007f
Merge pull request #16520 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-04 17:06:57 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
...
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
2021-03-04 16:53:54 +01:00
Laurent Destailleur
dcff298c5f
FIX #16533
2021-03-04 15:57:03 +01:00
Christophe Battarel
6a242edd8b
check unicity of serial number
2021-03-04 15:29:47 +01:00
Gauthier PC portable 024
845b1c6c94
Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries
2021-03-03 14:35:38 +01:00
Alexandre SPANGARO
59a2fb8ed5
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-03-03 14:08:40 +01:00
Frédéric FRANCE
22bc3b879b
new box replace
2021-03-02 22:21:34 +01:00
Frédéric FRANCE
d68de8617b
new box replace
2021-03-02 22:00:09 +01:00
Florian HENRY
6862c206aa
merge from develop
2021-03-02 21:48:35 +01:00
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-02 20:41:01 +01:00
Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
Laurent Destailleur
f219c9454a
Merge pull request #16251 from Hystepik/develop#5
...
Close #16218 : new button sitemap file
2021-03-02 14:56:10 +01:00
Laurent Destailleur
cffea1889f
FIX #16325
2021-03-02 01:17:28 +01:00
Frédéric FRANCE
3b428004d8
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-02 00:09:44 +01:00
Florian HENRY
1b57d2a4a0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus
2021-03-01 19:57:54 +01:00
Laurent Destailleur
222012da37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/paymentvarious.class.php
htdocs/compta/bank/various_payment/card.php
htdocs/don/card.php
htdocs/langs/en_US/main.lang
htdocs/public/payment/newpayment.php
test/phpunit/DateLibTzFranceTest.php
2021-03-01 15:48:30 +01:00
Laurent Destailleur
b2cfc431bc
Merge pull request #16489 from aspangaro/13p7
...
FIX: Total_ht not show in contract link element
2021-03-01 14:07:29 +01:00
Laurent Destailleur
5cddd0465c
Fix trans
2021-03-01 13:25:54 +01:00
Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-01 12:55:45 +01:00
Laurent Destailleur
81f1bee10c
Fix option DONATION_USE_THIRDPARTIES
2021-03-01 11:18:14 +01:00
Gauthier PC portable 024
6da28f5e44
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-03-01 11:12:03 +01:00
Laurent Destailleur
a68721c5b4
Fix missing translation
2021-03-01 10:58:06 +01:00
Hystepik
460bc2dbde
Merge branch 'develop' into develop#5
2021-03-01 09:03:38 +01:00
Alexandre SPANGARO
3b1a9cd668
FIX: Total_ht not show in contract link element
2021-03-01 03:18:14 +01:00
Alexandre SPANGARO
0d954cb1c7
FIX: Total_ht not show in contract link element
2021-03-01 03:09:36 +01:00
Alexandre SPANGARO
ad95caac7e
Merge branch 'develop' into 14a15
2021-02-28 07:12:24 +01:00
Alexandre SPANGARO
6e1d67084d
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-02-28 07:09:30 +01:00
Laurent Destailleur
747acd6764
Trans
2021-02-27 18:53:27 +01:00
Florian HENRY
eb17ae5fe2
fix event type select
2021-02-27 14:13:42 +01:00
Laurent Destailleur
34d00e5d5e
Look and feel v14
2021-02-27 02:44:52 +01:00
Laurent Destailleur
84219689a6
Look and feel v14
2021-02-27 02:00:00 +01:00
atm-lena
292076e5dd
Ajout conf qui permet de décocher / cocher par défaut le paiement automatique des salaires
2021-02-26 15:59:27 +01:00
Gauthier PC portable 024
e598b49545
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 15:33:36 +01:00
Laurent Destailleur
c4e98486f7
Trans
2021-02-26 15:15:55 +01:00
Laurent Destailleur
b95fd1697f
Merge pull request #16434 from altairisfr/serials_pr
...
differentiate serial numbers from lot management
2021-02-26 15:06:35 +01:00
Christophe Battarel
4aaf9e133a
change translation
2021-02-26 11:51:23 +01:00
Christophe Battarel
a61fa2b049
differentiate serial numbers from lot management
2021-02-25 15:15:00 +01:00
Alexandre SPANGARO
e177ac566c
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-02-25 05:02:03 +01:00
Nicolas
49c0967a3e
NEW option for Takepos to show the total price without tax
2021-02-24 15:48:15 +01:00
Gauthier PC portable 024
c0160a5f3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-23 15:20:15 +01:00
Gauthier PC portable 024
4f767c0823
Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries
2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a
FIX : correction of payment salaries list on employee tab of user card
2021-02-23 15:08:27 +01:00
Laurent Destailleur
0009ce1646
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-23 14:49:23 +01:00
Laurent Destailleur
888c072af0
NEW Can set a percentage when creating an invoice from another object
2021-02-23 14:48:54 +01:00
Florian HENRY
fa65956801
Merge branch 'develop' into dev_EventOrganisation_draft
2021-02-22 21:02:22 +01:00
Laurent Destailleur
f6080d45fa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-22 16:21:26 +01:00
Laurent Destailleur
912f9f9bdb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/card.php
htdocs/core/actions_massactions.inc.php
2021-02-22 15:54:24 +01:00
Laurent Destailleur
c010cab47e
Fix translation of default value for contacts
2021-02-22 15:51:00 +01:00
Gauthier PC portable 024
939d406ab1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-22 09:10:24 +01:00
Florian HENRY
be34fb4541
tab event ok
2021-02-21 12:32:16 +01:00
Florian HENRY
556ba2b369
statart card
2021-02-20 23:17:48 +01:00
Laurent Destailleur
3ab80469ae
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 16:11:36 +01:00
Laurent Destailleur
574c0df427
Merge pull request #16338 from aspangaro/13p5
...
Fix module asset in development
2021-02-19 16:05:35 +01:00
Laurent Destailleur
e2b469dee4
Update admin.lang
2021-02-19 15:54:30 +01:00
Laurent Destailleur
70e2d1dbbd
Merge branch 'develop' into dev_EventOrganisation_ProjectCardAndList
2021-02-19 12:54:38 +01:00
Laurent Destailleur
fc9d6cef97
Enhancement Auto and manual calendar. Better separation.
2021-02-18 11:16:36 +01:00
Gauthier PC portable 024
134d7e00ec
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-17 16:56:50 +01:00
Laurent Destailleur
cc3ae59f3f
Merge pull request #16312 from ATM-Consulting/new/14.0_auto_close_project_when_all_tasks_done
...
NEW option to automatically close an open project when all its tasks …
2021-02-16 20:14:51 +01:00
Laurent Destailleur
c569c503f7
Fix label
2021-02-16 19:59:42 +01:00
Florian HENRY
02a2610432
NEW: Conf for default actiomm status when created from card
2021-02-16 19:22:36 +01:00
Florian Mortgat
186dcab1b7
Merge branch 'NEW/12.0_new_payments_on_vat' of github.com:ATM-Consulting/dolibarr into NEW/14.0_new_payments_on_vat_default_checkbox_value
2021-02-16 16:28:14 +01:00
Florian Mortgat
363fe1f52f
NEW 12.0: option to leave the "Automatically create a total payment" checkbox empty on the tax creation page
2021-02-16 15:44:24 +01:00
Florian Mortgat
0f68b69383
NEW option to automatically close an open project when all its tasks are done (=progress 100%)
2021-02-16 14:11:21 +01:00
Laurent Destailleur
61b153692c
Fix tooltip on permissions of website
2021-02-16 12:38:40 +01:00
Laurent Destailleur
6f909bb32a
Fix tooltip on permissions of website
2021-02-16 12:32:03 +01:00
Laurent Destailleur
6f25f7c2cb
Clean code
2021-02-16 11:43:26 +01:00
Alexandre SPANGARO
8079105aaf
NEW: VAT report - Optimisation & collapse by rate
2021-02-16 04:28:55 +01:00
Laurent Destailleur
0bac454f25
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-15 16:40:45 +01:00
Laurent Destailleur
8b34c29be9
Fix translation
2021-02-15 16:39:30 +01:00
Laurent Destailleur
7b383b58c6
Trans
2021-02-15 16:35:51 +01:00
Laurent Destailleur
d183a7eedf
Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage
...
wip : Event Organization module - PR-1 - setup page #FoundationFunding
2021-02-15 15:59:19 +01:00
Laurent Destailleur
b98a654321
NEW The setup for mandatory field can be done on combo list too.
2021-02-15 15:37:43 +01:00
Laurent Destailleur
7e7d393f30
Look and feel v14
2021-02-15 14:19:05 +01:00
Laurent Destailleur
026259ebd7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
2021-02-15 13:12:27 +01:00
Florian HENRY
649517fc99
Merge branch 'dev_EventOrganisation_setuppage' into dev_EventOrganisation_ProjectCardAndList
2021-02-15 12:18:32 +01:00
Florian HENRY
f186e7bf4b
project list and card ok
2021-02-15 12:18:08 +01:00
Florian HENRY
1427f66e10
Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_setuppage
2021-02-15 11:20:07 +01:00
Florian HENRY
e1f503a8cf
Merge branch 'develop' into dev_EventOrganisation
2021-02-15 11:19:08 +01:00
Laurent Destailleur
f4c23654f8
FIX #16275 #15604
2021-02-14 22:44:04 +01:00
Laurent Destailleur
fac38e50d6
Fix #16256
2021-02-14 22:16:15 +01:00
Florian HENRY
5d8aaefb26
fix indent
2021-02-14 17:12:36 +01:00
Florian HENRY
b5055a5edb
config pages ok
2021-02-14 16:41:57 +01:00
Florian HENRY
07984d9a6e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-02-14 15:02:29 +01:00
Florian HENRY
d7dfb9138a
working on setup
2021-02-14 15:00:20 +01:00
Laurent Destailleur
50797bf892
Fix typo
2021-02-12 17:17:48 +01:00
Laurent Destailleur
cd4d790d2b
Add parameters of batch into comment description
2021-02-12 17:15:23 +01:00
Florian HENRY
13522fdf5f
start module dev
2021-02-11 17:05:04 +01:00
lmarcouiller
40b20d510d
fix to fix PR
2021-02-11 10:05:40 +01:00
lmarcouiller
484b406985
Add website url form
2021-02-10 10:41:13 +01:00
lmarcouiller
1ae3b151c8
Add new button to generate sitemap
2021-02-10 09:11:53 +01:00
Laurent Destailleur
d80f23589d
Fix missing entry
2021-02-10 02:39:58 +01:00
Laurent Destailleur
1c99eaedbc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-09 14:00:11 +01:00
Laurent Destailleur
4a97690f78
Add a check on syntax of hostname for email colector
2021-02-09 13:59:00 +01:00
Laurent Destailleur
3d892bd60b
Merge pull request #15735 from FHenry/dev_new_project_task_add_contact
...
NEW: When add contact/user to Project, ask to also affect on Tasks
2021-02-09 13:43:08 +01:00
Gauthier PC portable 024
d106fe7e90
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-09 09:50:46 +01:00
Gauthier PC portable 024
41af1a59f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-02-08 09:46:48 +01:00
Alexandre SPANGARO
b8ea96ba57
Fix module asset in development
2021-02-08 05:39:07 +01:00
Laurent Destailleur
fd3354142b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
2021-02-06 01:17:05 +01:00
Laurent Destailleur
c6badeed57
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/compta/prelevement/card.php
2021-02-06 01:14:48 +01:00
Laurent Destailleur
4428e2b18e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/product/price.php
2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/card.php
2021-02-06 01:03:31 +01:00
Laurent Destailleur
9843e79bac
Trans
2021-02-05 15:43:03 +01:00
Gauthier PC portable 024
d93c71a42f
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
2021-02-05 12:28:15 +01:00
Gauthier PC portable 024
e6bea60409
FIX : bank_url
2021-02-05 12:27:14 +01:00
Florian Mortgat
3f862bf43e
FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already
2021-02-05 11:34:39 +01:00
Gauthier PC portable 024
df8ca1ef84
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
2021-02-05 09:29:20 +01:00
Laurent Destailleur
49470ea216
Trans
2021-02-05 00:56:44 +01:00
Gauthier PC portable 024
e188ec6cd7
NEW : add real payments on salaries objects
2021-02-04 17:21:08 +01:00
Laurent Destailleur
eee49b9132
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/delais.php
2021-02-04 13:50:07 +01:00
Laurent Destailleur
eca010937f
FIX Trigger on expense report was not fired
...
FIX Bad dates on info tabs
2021-02-04 11:56:53 +01:00
Laurent Destailleur
369a835abb
Merge pull request #16151 from bb2a/mass_action_propal_nosigned
...
NEW: add massActions to set a commercial proposal to status "Refused"
2021-02-03 20:36:10 +01:00
Anthony Berton
eb15c4d800
20200203
2021-02-03 11:29:54 +01:00
Laurent Destailleur
4d029194d3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/ajax.lib.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
2021-02-02 13:22:23 +01:00
Laurent Destailleur
f4f9a7c461
Clean page of info tools
2021-02-02 09:44:51 +01:00
Gauthier PC portable 024
1eb4968a29
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-02-01 12:00:04 +01:00
Laurent Destailleur
b349290cd1
Fix test for date in future
2021-01-31 12:57:54 +01:00
Laurent Destailleur
b24aac1e6b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
2021-01-31 12:03:39 +01:00
Laurent Destailleur
215e36bb2e
Fix typo
2021-01-29 11:19:33 +01:00
Laurent Destailleur
ce3279c462
NEW Add function showValueWithCopyAndPasteButton() to add a copy/paste
...
button on a text.
2021-01-28 12:34:54 +01:00
Laurent Destailleur
4fbf2fff6f
Merge pull request #16034 from Hystepik/develop#2
...
Close #16027 New Feature copy Code Client
2021-01-28 11:17:10 +01:00
Gauthier PC portable 024
8a5588e518
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-01-28 10:28:36 +01:00
Laurent Destailleur
a4c0459c1e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/list.php
2021-01-27 21:09:01 +01:00
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-26 20:19:49 +01:00
Laurent Destailleur
19dd36aa59
Trans
2021-01-26 11:45:29 +01:00
Laurent Destailleur
6313fb8be0
Fix lang
2021-01-26 11:38:07 +01:00
Laurent Destailleur
c417f730b9
Clean language file
2021-01-26 11:31:48 +01:00
Alexandre SPANGARO
94d4f2da8e
Missing language key & error translation
2021-01-26 05:14:01 +01:00
Laurent Destailleur
b4be97ec15
Draft code
2021-01-25 18:59:04 +01:00
Laurent Destailleur
21dccadb3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/banks.lang
htdocs/stripe/class/stripe.class.php
2021-01-24 15:32:39 +01:00
Laurent Destailleur
0f5fc7353e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/admin/mailing.php
htdocs/admin/paymentbybanktransfer.php
htdocs/admin/prelevement.php
htdocs/modulebuilder/template/admin/setup.php
2021-01-24 15:29:53 +01:00
Laurent Destailleur
7365974594
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/langs/en_US/banks.lang
htdocs/stripe/class/stripe.class.php
2021-01-24 15:24:56 +01:00
Laurent Destailleur
b4783f69d6
Show if permission is an advanced permission
2021-01-23 18:13:50 +01:00
Laurent Destailleur
f7e637a552
Trans
2021-01-23 17:40:14 +01:00
Laurent Destailleur
2acf2353a3
Fix bad link
2021-01-23 12:16:25 +01:00
Laurent Destailleur
599d69b07c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/contact/class/contact.class.php
htdocs/langs/fr_FR/stocks.lang
htdocs/modulebuilder/template/myobject_list.php
2021-01-22 13:40:00 +01:00
Laurent Destailleur
79fb672674
Sync transifex
2021-01-22 01:47:29 +01:00
Laurent Destailleur
8e5b971c49
Merge pull request #15918 from zuiko/patch-1
...
Fix #15633 : Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
2021-01-21 13:33:47 +01:00
lmarcouiller
b2809e4ee2
add trans to copied to clipboard text
2021-01-21 09:54:26 +01:00
Laurent Destailleur
79308b332b
Trans
2021-01-20 11:41:17 +01:00
Frédéric FRANCE
e8c4db2188
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-19 11:36:59 +01:00
Laurent Destailleur
2c6d11e040
When creating invoice by mass action, message has link to invoice
2021-01-19 10:42:43 +01:00
Gauthier PC portable 024
e2abbbcece
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
2021-01-19 08:57:24 +01:00
Gauthier PC portable 024
2cfaf5fbd6
NEW : add real payments on vat objects
2021-01-18 17:08:17 +01:00
Laurent Destailleur
f95bf56c15
Fix translation
2021-01-18 15:24:50 +01:00
Frédéric FRANCE
c8d1410e33
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-16 21:06:12 +01:00
Laurent Destailleur
87d16c56e7
Merge pull request #15977 from frederic34/TotalAmountOfdirectDebitOrderDiffersFromSumOfLines
...
add missing translation
2021-01-16 17:28:20 +01:00
Laurent Destailleur
d592a5d669
Trans
2021-01-16 16:47:38 +01:00
Laurent Destailleur
04e669ec96
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/langs/fr_FR/other.lang
2021-01-16 15:38:34 +01:00
Laurent Destailleur
064b00e979
Sync transifex
2021-01-16 15:33:47 +01:00
Frédéric FRANCE
871f762546
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-16 13:58:27 +01:00
Laurent Destailleur
ba37396af2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-15 14:36:32 +01:00
Laurent Destailleur
e8ed6a9f09
Trans
2021-01-15 14:33:26 +01:00
Laurent Destailleur
828f1c8314
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
2021-01-15 14:04:22 +01:00
Laurent Destailleur
c3046326cb
Fix help
2021-01-15 12:42:40 +01:00
Laurent Destailleur
16d98d2691
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/projet/graph_opportunities.inc.php
htdocs/user/class/usergroup.class.php
2021-01-14 14:09:09 +01:00
Laurent Destailleur
768d2db8a1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/projet/graph_opportunities.inc.php
htdocs/user/class/usergroup.class.php
2021-01-14 13:43:48 +01:00
Laurent Destailleur
ea47a55144
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-01-14 12:59:27 +01:00
Laurent Destailleur
1cf86931b3
Fix graph of opportunity when a status has been removed.
2021-01-14 12:58:50 +01:00
Frédéric FRANCE
271378fb87
add translation
2021-01-13 18:09:57 +01:00
Frédéric FRANCE
a5678147dd
add missing translation
2021-01-13 16:52:32 +01:00
Laurent Destailleur
b7402ecf3f
Merge branch 'develop' into NEW_product_customer_price_ref
2021-01-13 13:38:19 +01:00
Frédéric FRANCE
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-12 23:47:24 +01:00
Marc de Lima Lucio
82b0f18378
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
2021-01-12 15:10:15 +01:00
Laurent Destailleur
c2187b2ff1
Merge branch 'develop' into develop_new_workstation
2021-01-11 17:59:13 +01:00
Laurent Destailleur
cae9dc3acf
Merge pull request #15925 from FHenry/dev_add_tag_contact_thirdpartycontactcreateion
...
NEW : Add contact tag and bulk email status on thirparty+contact create form
2021-01-11 17:28:12 +01:00
Laurent Destailleur
df3034d13a
Merge branch 'develop' into patch-1
2021-01-11 17:15:46 +01:00
Laurent Destailleur
8a3a59dfca
Merge pull request #15636 from aspangaro/14a5
...
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
2021-01-11 17:10:03 +01:00
atm-lena
f17474a8de
12.0 FIX Translation Permission777 FR
2021-01-11 16:56:19 +01:00
Laurent Destailleur
307d718e82
Merge pull request #15931 from ATM-Nicolas/new_shipping_workflow
...
NEW : Workflow to set a shipment as closed
2021-01-11 16:34:26 +01:00
Gauthier PC portable 024
8dfb088fc5
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation
2021-01-11 10:34:38 +01:00
Anthony Berton
d3fa8b9f20
20210110
2021-01-10 01:07:27 +01:00
Laurent Destailleur
f411b29b28
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/accountancy.lang
2021-01-09 02:34:43 +01:00
ATM-Nicolas
5a6e4f54f0
NEW : Workflow to set a shipment as closed
2021-01-08 16:25:54 +01:00
Laurent Destailleur
69c614ec2a
Sync transifex
2021-01-08 11:22:11 +01:00
Alexandre SPANGARO
9fa23dea49
Add missing language key
2021-01-07 17:39:38 +01:00
Florian HENRY
8adfe54949
bulk email management
2021-01-07 17:33:57 +01:00
Laurent Destailleur
6da3ed1a51
Merge 2 exclusive options into 1
2021-01-07 12:39:51 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product
...
NEW: preload product description on selection for customer propal/order/invoice
2021-01-07 11:19:53 +01:00
Laurent Destailleur
55b46ca149
Merge pull request #15318 from bafbes/abb120353
...
New: add notification on ACTION_CREATE event
2021-01-07 11:17:33 +01:00
Alexandre SPANGARO
4077565de9
Merge branch '13.0' into 13b5
2021-01-07 05:27:43 +01:00
zuiko
2300c040b3
Update admin.lang
2021-01-06 23:40:27 +01:00
zuiko
e861248af8
Update admin.lang
...
Fix #15633
2021-01-06 23:37:58 +01:00
Frédéric FRANCE
1e8362575a
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-06 21:05:59 +01:00
Norbert Penel
361d2352a5
German date format
...
fixed by my client, they use a dot in this case :
https://www.wikihow.com/Write-German-Dates
2021-01-06 12:12:14 +01:00
Laurent Destailleur
ba68c958e1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 19:12:57 +01:00
Marc de Lima Lucio
f03f5701f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
2021-01-05 16:01:31 +01:00
Laurent Destailleur
4b45c5e723
Trans
2021-01-05 12:29:13 +01:00
Florian HENRY
dfaf77b03f
merge develop
2021-01-03 15:14:34 +01:00
Alexandre SPANGARO
e18bdfd9f0
Add missing language key
2021-01-03 15:01:15 +01:00
Alexandre SPANGARO
99949c4817
Merge remote-tracking branch 'upstream/develop' into 14a5
2021-01-03 11:46:20 +01:00
Frédéric FRANCE
bd762bc58f
boxes
2021-01-02 21:50:58 +01:00
Laurent Destailleur
7f0f72ca47
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:18 +01:00
Laurent Destailleur
1ab459e854
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:08 +01:00
Alexandre SPANGARO
2727fd70b7
FIX: Accountancy - Debug experimental function to validate movements
2021-01-02 14:00:24 +01:00
Frédéric FRANCE
b71e837ddd
clean code
2021-01-02 10:18:58 +01:00
Frédéric FRANCE
2894dac221
clean code
2021-01-02 10:17:11 +01:00
Laurent Destailleur
dbbd5e1abe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-01 22:00:17 +01:00
Laurent Destailleur
a8cd62c44e
Add AUDIT_ENABLE_PREFIX_SESSION
2021-01-01 22:00:00 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
...
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
2021-01-01 21:36:15 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1
2021-01-01 20:52:43 +01:00
Laurent Destailleur
020caf8809
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-30 23:52:36 +01:00
Laurent Destailleur
ab54d30b57
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
2020-12-30 21:48:44 +01:00
Laurent Destailleur
79da047802
FIX Dates of sales start in TakePOS
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
2020-12-30 21:46:40 +01:00
Laurent Destailleur
6ef7d3db79
FIX Dates of sales start in TakePOS
2020-12-30 21:43:04 +01:00
Laurent Destailleur
92a88441ac
Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping
...
Dev multifilter jounal on bookeping
2020-12-30 13:19:27 +01:00
Laurent Destailleur
b6e33771be
Update accountancy.lang
2020-12-30 13:19:15 +01:00
Laurent Destailleur
744bc56953
Merge pull request #15283 from prietojc/12.0.3
...
NEW massaction for Bank Transfer
2020-12-30 13:11:31 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction
2020-12-30 13:10:02 +01:00
Laurent Destailleur
057ed201a7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
2020-12-30 12:08:12 +01:00
Florian HENRY
806b40662f
merge develop
2020-12-28 21:15:25 +01:00
Alexandre SPANGARO
9eaeab1208
Merge remote-tracking branch 'upstream/develop' into 14a5
2020-12-28 03:30:41 +01:00
Laurent Destailleur
199b46cfaf
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/langs/en_US/modulebuilder.lang
2020-12-27 16:53:15 +01:00
Laurent Destailleur
5fc3a9ce7d
Debug v13
2020-12-27 15:39:10 +01:00
Laurent Destailleur
28642238de
Fix error message
2020-12-27 15:09:27 +01:00
Maxime Kohlhaas
11146a0b66
Add contact tab in default generated php files
2020-12-25 11:52:34 +01:00
Florian HENRY
5ae5f3e7ac
let societe project acctioncomme website accounr
2020-12-24 00:32:54 +01:00
Florian HENRY
720539ff46
on goung
2020-12-23 23:52:43 +01:00
Florian HENRY
26d3ea2227
on going
2020-12-23 23:32:50 +01:00
Laurent Destailleur
f8e4985de1
Trans
2020-12-23 22:30:29 +01:00
Laurent Destailleur
6fad9c2d3b
Fix edition of operation into email collector
2020-12-22 16:59:59 +01:00
Laurent Destailleur
ef2bd563e2
trans
2020-12-22 16:55:51 +01:00
Laurent Destailleur
0068c1fb78
Trans
2020-12-22 16:29:53 +01:00
Laurent Destailleur
5252aa42b2
Trans
2020-12-21 18:20:13 +01:00
Gauthier PC portable 024
7b739920a2
NEW : Workstations management
2020-12-21 12:28:45 +01:00
Laurent Destailleur
157e94a664
Fix trans
2020-12-19 16:50:31 +01:00
Laurent Destailleur
fe93ee4d08
Debug website module for multilanguage
2020-12-19 13:03:40 +01:00
Laurent Destailleur
0eaf924d3b
Add warning on non https website to axplain why features is broken
2020-12-18 15:08:00 +01:00
Laurent Destailleur
90d8299c92
Fix purge tool
2020-12-18 13:24:02 +01:00
Laurent Destailleur
b0d524beed
Debug v13
2020-12-17 11:57:12 +01:00
Laurent Destailleur
edb02ef05a
Fix ticket
2020-12-16 19:03:19 +01:00
Laurent Destailleur
e7dda7bb4f
Move help into tooltip help section
2020-12-16 15:46:54 +01:00
Laurent Destailleur
93b9061a71
Merge pull request #15698 from StephaneLesage/export-categories
...
FIX: missing imports/exports of categories
2020-12-16 15:30:00 +01:00
Laurent Destailleur
1d6e2a01a6
Merge pull request #15762 from aspangaro/13b1
...
FIX: Accountancy - Quadra export format - Manage negative amount
2020-12-16 15:24:14 +01:00
Alexandre SPANGARO
ca40d5e52a
NEW: Accountancy - Introduce FEC "2" Format to resolve conflict with some software
2020-12-16 05:16:08 +01:00
Alexandre SPANGARO
ca6b8176e9
Merge remote-tracking branch 'upstream/develop' into 13b1
2020-12-16 04:32:26 +01:00
Stephane Lesage
7853e77d3f
Export/Import categories missing fields and clean
2020-12-15 19:53:47 +01:00
Laurent Destailleur
37fe5bb3ef
Solve blocking feature. Can increase stock of a Kit without changing
...
subproduct stock.
2020-12-15 15:18:01 +01:00
Laurent Destailleur
1f6f4742d5
Trans
2020-12-15 14:01:25 +01:00
Laurent Destailleur
cee63335a2
FIX #15754 Mor complete PR
2020-12-15 13:38:21 +01:00
Laurent Destailleur
a2bd920371
Fix translation of units
2020-12-15 11:39:18 +01:00
Laurent Destailleur
2ae1aac5a4
Fix setup
2020-12-15 11:18:29 +01:00
Laurent Destailleur
31693eed21
Fix setup was not clear
2020-12-15 11:10:35 +01:00
Alexandre SPANGARO
5ec7b01fb4
FIX: Link to subaccount ledger
2020-12-15 09:34:46 +01:00
Alexandre SPANGARO
31e5709e0b
Revert "FIX: Link to subaccount ledger"
...
This reverts commit 64fa2120b2
2020-12-15 09:32:54 +01:00
Alexandre SPANGARO
64fa2120b2
FIX: Link to subaccount ledger
2020-12-15 08:40:14 +01:00
Alexandre SPANGARO
593f5bcb7a
Merge remote-tracking branch 'upstream/develop' into 14a5
2020-12-15 06:50:22 +01:00
Laurent Destailleur
d9886044a6
Trans
2020-12-14 15:10:31 +01:00
Laurent Destailleur
acb73966f7
Clean code. Removed phpexcel library.
2020-12-13 16:27:44 +01:00
Laurent Destailleur
a5d2e04dea
Debug v13
2020-12-12 19:09:07 +01:00
Laurent Destailleur
33bb1919f0
Merge branch 'develop' into develop#3
2020-12-12 12:23:33 +01:00
Florian HENRY
0ed084d585
NEW: When add contact/user to Project, ask to also affect on project task
2020-12-11 17:38:38 +01:00
Laurent Destailleur
18efbebd02
css
2020-12-11 17:11:50 +01:00
lmarcouiller
dea75e6158
Close #15729 : fix error on box name and format
2020-12-11 15:55:17 +01:00
lmarcouiller
a5cf177025
Close #15729 : first push
2020-12-11 15:22:29 +01:00
Laurent Destailleur
2adbd29b49
Debug generation of doc from modulebuilder
2020-12-11 14:22:36 +01:00
Laurent Destailleur
cfa194436f
Debug v13
2020-12-11 00:55:21 +01:00
Laurent Destailleur
693a7590ef
Fix boxes
2020-12-10 17:09:25 +01:00
Laurent Destailleur
c850f4c918
Fix fatal error
2020-12-10 16:01:06 +01:00
Stephane Lesage
bcf4f65cc9
Fix & sync import/export entity icons/labels translation
2020-12-10 14:15:33 +01:00
Laurent Destailleur
dac0267a38
Fix debug various payment module.
...
Fix debug report income/expense (for situation that should not happen
but if it happen, result is consistent with other screens).
2020-12-09 21:51:01 +01:00
Laurent Destailleur
075cacb8cf
Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF
2020-12-09 17:40:28 +01:00
Alexandre SPANGARO
54fad02936
Fix PR
2020-12-08 13:55:51 +01:00
Alexandre SPANGARO
78dc1eaa83
Merge remote-tracking branch 'upstream/develop' into 14a5
2020-12-08 13:51:01 +01:00
Laurent Destailleur
f21a4e8aed
Merge branch 'develop' into develop#3
2020-12-07 22:46:36 +01:00
Laurent Destailleur
6abf1b6ac2
Error message
2020-12-07 20:59:07 +01:00
Hystepik
2ac98d06f5
Merge branch 'develop' into develop#3
2020-12-07 09:03:59 +01:00
Laurent Destailleur
1f83e22aea
Fix set of translation of website page during cloning
2020-12-06 15:59:19 +01:00
Denis
2173b8566e
Corrected "cash fence" to "cash desk closing" on english .lang files
2020-12-04 10:58:29 +01:00
Alexandre SPANGARO
13f985d280
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
2020-12-04 04:13:42 +01:00
Hystepik
ecb5a3b028
Merge branch 'develop' into develop#3
2020-12-03 10:12:19 +01:00
lmarcouiller
032116b235
changes to not diplay won and lost and add on migration
2020-12-03 10:11:16 +01:00
Laurent Destailleur
9e18997e64
FIX #15595
2020-12-02 16:35:43 +01:00
Laurent Destailleur
409b73fe2c
FIX #15582
2020-12-02 15:16:04 +01:00
Laurent Destailleur
c8274f13eb
Merge pull request #15582 from Hystepik/develop
...
Close #15307 New Widget : Encours dépassé
2020-12-02 14:01:50 +01:00
Laurent Destailleur
28cb5d05ff
Trans
2020-12-01 03:02:19 +01:00
Laurent Destailleur
fc5dc0865d
Trans
2020-12-01 02:37:22 +01:00
Laurent Destailleur
fc97e9fe4f
Fix trans
2020-12-01 01:38:06 +01:00
Laurent Destailleur
cf2dd28a21
Fix warning when setup not complete.
2020-11-30 19:40:53 +01:00
Laurent Destailleur
3443174f67
Sync transifex
2020-11-30 18:28:04 +01:00
lmarcouiller
6e9a3c05f4
Close : Encours dépassé #15307
2020-11-30 13:52:02 +01:00
Laurent Destailleur
379bca0b61
Clean code
2020-11-30 13:18:23 +01:00
Laurent Destailleur
66381a4f4d
FIX #15558
2020-11-29 19:41:11 +01:00
Laurent Destailleur
6c65ebef0d
Look and feel v13
2020-11-29 15:16:53 +01:00
Laurent Destailleur
fab9b3d50c
Fix warning
2020-11-28 18:34:13 +01:00
Laurent Destailleur
7c4599a5c5
Look and feel v13
2020-11-28 01:15:23 +01:00
Laurent Destailleur
b3b511a6d4
FIX #15546
2020-11-26 22:44:11 +01:00
Laurent Destailleur
f231620084
Fix creation of MRP when product is a kit.
2020-11-26 14:32:40 +01:00
Laurent Destailleur
e1a6e8f2fc
CSS
...
Security: Add param to fight against Clickjacking attacks
2020-11-26 11:29:16 +01:00
Laurent Destailleur
22bcb08950
Update doc
2020-11-25 23:03:17 +01:00
Laurent Destailleur
148f822251
Trans
2020-11-24 14:59:37 +01:00
Laurent Destailleur
551f82ef6a
Fix label
2020-11-24 14:15:43 +01:00
Laurent Destailleur
53cf513173
Merge pull request #15180 from aspangaro/14a1
...
NEW: Accountancy - Add export for Gestinum (v3 & v5)
2020-11-24 09:10:59 +01:00
Laurent Destailleur
efc539c4b4
Fix css
2020-11-23 19:53:58 +01:00
Laurent Destailleur
d2d202dfc7
Fix ProfID5 must be EORI for ES too
2020-11-23 13:22:17 +01:00
Laurent Destailleur
edb462cca2
Trans
2020-11-22 12:32:08 +01:00
Laurent Destailleur
f39ad2359a
Debug
2020-11-21 17:01:17 +01:00
Laurent Destailleur
95b79094df
Fix warning.
...
Module cron is more clear.
2020-11-21 16:27:50 +01:00
Laurent Destailleur
3534555909
Fix setup of scheduled jobs
2020-11-21 14:14:53 +01:00
Laurent Destailleur
772d401a64
FIX Restore a more common behavior. Add a hidden constant to switch to a
...
mode when we must enabled load of shippable status.
2020-11-19 19:56:00 +01:00
Laurent Destailleur
9ef395a183
Merge pull request #15444 from OPEN-DSI/new-order-list-hide-shippable-icon-by-default
...
NEW Add an option to hide by default icon shippable order in order list
2020-11-19 18:53:13 +01:00
Laurent Destailleur
131c4f8ca8
Fix trans
2020-11-19 15:00:14 +01:00
Laurent Destailleur
939dfc7ead
Add a test to avoid translation "=-"
2020-11-19 14:57:36 +01:00
Laurent Destailleur
caf77355ae
Introduce EORI number
2020-11-19 14:38:11 +01:00
lvessiller
73dab143a3
NEW Add an option to hide by default icon shippable order in command list
2020-11-19 14:14:24 +01:00
Florian HENRY
46326d7659
merge from develop
2020-11-19 13:53:34 +01:00
Laurent Destailleur
b9f072498c
Fix lang
2020-11-19 11:58:55 +01:00
Laurent Destailleur
6944e13b58
Fix % in lang file
2020-11-18 18:11:52 +01:00
Laurent Destailleur
32ae1bf350
Sync transifex
2020-11-18 15:56:06 +01:00
Laurent Destailleur
081474b65d
Trans
2020-11-18 14:24:24 +01:00
Laurent Destailleur
cfee518338
Fix trans
2020-11-18 14:03:44 +01:00
kamel
73b35f334e
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
...
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
2020-11-18 09:41:42 +01:00
Laurent Destailleur
d8753ea224
Fix trans
2020-11-16 14:15:54 +01:00
Laurent Destailleur
928330c44b
Fix link to reconciliation page
2020-11-16 12:42:59 +01:00
Frédéric FRANCE
894e586669
add translation
2020-11-15 13:39:48 +01:00
Laurent Destailleur
8aaee7fa5e
Fix replenishment must exclude parent of variants.
2020-11-13 11:28:02 +01:00
Laurent Destailleur
a98d025f5a
Clean option for replenishment on real stock.
2020-11-13 11:06:51 +01:00
Laurent Destailleur
6d4d3c618d
FIX #15369 and standardize permission "readall"
2020-11-13 09:55:53 +01:00
jcp
10ae18fe44
Update SQL migration
2020-11-12 19:42:20 +01:00
Laurent Destailleur
ec283dc04f
Removed duplicated translation keys
2020-11-11 23:50:46 +01:00
Laurent Destailleur
741806f47e
Clean code
2020-11-11 16:08:00 +01:00
Laurent Destailleur
47b3b30aaa
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/fourn/product/list.php
htdocs/product/fournisseurs.php
htdocs/societe/card.php
2020-11-10 11:10:35 +01:00
Alexandre SPANGARO
77021bf355
Merge remote-tracking branch 'upstream/develop' into 14a1
2020-11-10 04:09:58 +01:00
jcp
50d530733e
NEW: ICS fields moved into bank account table
2020-11-09 14:08:34 +01:00
Laurent Destailleur
136abc44e1
Fix clone in recruitment module
2020-11-09 09:13:24 +01:00
Alexandre SPANGARO
6b91f739be
Merge remote-tracking branch 'upstream/develop' into 14a1
2020-11-08 03:58:22 +01:00
Florian HENRY
1bdd617feb
NEW: Multiselect ledger account code filter on book keeping list
2020-11-07 15:31:27 +01:00
bahfir abbes
11099132da
New: add notification on ACTION_CREATE event
2020-11-06 00:48:23 +01:00
Laurent Destailleur
6080e5335f
Minor fix
2020-11-05 12:56:20 +01:00
Laurent Destailleur
779566ef30
Clean page with security summary
2020-11-05 10:03:53 +01:00
Laurent Destailleur
7afac764c3
Merge pull request #15271 from frederic34/patch-6
...
typo
2020-11-04 18:10:02 +01:00
Laurent Destailleur
38d88ced0b
Debug the security page
2020-11-04 16:07:59 +01:00
Laurent Destailleur
7294a47ef5
Fix generation of user from member, contact, applications for job
2020-11-04 13:33:52 +01:00
jcp
518a225f7b
NEW massaction for BankTransfer
2020-11-03 20:53:26 +01:00
Frédéric FRANCE
277045167d
typo
2020-11-03 08:10:22 +01:00
Laurent Destailleur
97c5747455
Look and feel v13
2020-11-03 04:19:04 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Laurent Destailleur
582cbc3624
Merge pull request #15248 from frederic34/emailsubscription
...
add missing pictos
2020-11-01 18:00:18 +01:00
Laurent Destailleur
e0ed89c514
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
45f834cb15
FIX #15199
2020-11-01 15:20:33 +01:00
Frédéric FRANCE
fcddf03164
fix
2020-11-01 14:13:39 +01:00
Laurent Destailleur
e5a5f37b3f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/bills.lang
2020-10-31 15:09:26 +01:00
Laurent Destailleur
92bdcd017d
Fix
2020-10-31 14:26:11 +01:00
Laurent Destailleur
11f9c4cfbd
Merge pull request #15117 from atm-jpb/develop_editorRate
...
# New multi-currency exchange rate editor
2020-10-31 13:55:42 +01:00
Laurent Destailleur
0a9c7fc577
Look and feel v13
2020-10-31 04:19:22 +01:00
Laurent Destailleur
23d0d4635a
Trans
2020-10-30 18:16:19 +01:00
ATM john
61cb99117a
Add missing lang trans
2020-10-30 09:33:07 +01:00
Florian HENRY
d77a0b40a8
tested and approuve feaure #15036
2020-10-28 16:37:41 +01:00
Alexandre SPANGARO
86ee75363a
NEW: Accountancy - Add a ledger for subaccount
2020-10-28 09:49:38 +01:00
Alexandre SPANGARO
d46feda3e5
NEW: Accountancy - Add export for Gestinum (v3 & v5)
2020-10-27 16:13:07 +01:00
Laurent Destailleur
c81c3ec71a
Fix translation
2020-10-27 03:20:33 +01:00
Laurent Destailleur
e637b60b4b
Fix regression in language files
2020-10-27 03:04:53 +01:00
Laurent Destailleur
d2a2d74f7e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/langs/am_ET/mrp.lang
htdocs/langs/ar_SA/mrp.lang
htdocs/langs/az_AZ/mrp.lang
htdocs/langs/bg_BG/mrp.lang
htdocs/langs/bn_BD/mrp.lang
htdocs/langs/bn_IN/mrp.lang
htdocs/langs/bs_BA/mrp.lang
htdocs/langs/ca_ES/mrp.lang
htdocs/langs/cs_CZ/mrp.lang
htdocs/langs/da_DK/mrp.lang
htdocs/langs/de_DE/mrp.lang
htdocs/langs/el_GR/mrp.lang
htdocs/langs/en_US/mrp.lang
htdocs/langs/es_ES/mrp.lang
htdocs/langs/et_EE/mrp.lang
htdocs/langs/eu_ES/mrp.lang
htdocs/langs/fa_IR/mrp.lang
htdocs/langs/fi_FI/mrp.lang
htdocs/langs/fr_FR/mrp.lang
htdocs/langs/gl_ES/mrp.lang
htdocs/langs/he_IL/mrp.lang
htdocs/langs/hi_IN/mrp.lang
htdocs/langs/hr_HR/mrp.lang
htdocs/langs/hu_HU/mrp.lang
htdocs/langs/id_ID/mrp.lang
htdocs/langs/is_IS/mrp.lang
htdocs/langs/it_IT/mrp.lang
htdocs/langs/ja_JP/mrp.lang
htdocs/langs/ka_GE/mrp.lang
htdocs/langs/km_KH/mrp.lang
htdocs/langs/kn_IN/mrp.lang
htdocs/langs/ko_KR/mrp.lang
htdocs/langs/lo_LA/mrp.lang
htdocs/langs/lt_LT/mrp.lang
htdocs/langs/lv_LV/mrp.lang
htdocs/langs/mk_MK/mrp.lang
htdocs/langs/mn_MN/mrp.lang
htdocs/langs/nb_NO/mrp.lang
htdocs/langs/ne_NP/mrp.lang
htdocs/langs/nl_NL/mrp.lang
htdocs/langs/pl_PL/mrp.lang
htdocs/langs/pt_PT/mrp.lang
htdocs/langs/ro_RO/mrp.lang
htdocs/langs/ru_RU/mrp.lang
htdocs/langs/sk_SK/mrp.lang
htdocs/langs/sl_SI/mrp.lang
htdocs/langs/sq_AL/mrp.lang
htdocs/langs/sr_RS/mrp.lang
htdocs/langs/sv_SE/mrp.lang
htdocs/langs/sw_SW/mrp.lang
htdocs/langs/th_TH/mrp.lang
htdocs/langs/tr_TR/mrp.lang
htdocs/langs/uk_UA/mrp.lang
htdocs/langs/uz_UZ/mrp.lang
htdocs/langs/vi_VN/mrp.lang
htdocs/langs/zh_CN/mrp.lang
htdocs/langs/zh_HK/mrp.lang
htdocs/langs/zh_TW/mrp.lang
htdocs/mrp/class/mo.class.php
htdocs/mrp/mo_agenda.php
htdocs/mrp/mo_card.php
htdocs/mrp/mo_document.php
htdocs/mrp/mo_movements.php
htdocs/mrp/mo_note.php
htdocs/mrp/mo_production.php
2020-10-27 02:55:22 +01:00
Alfredo Altamirano
43fd659d2a
Rename translation string MO for ManufacturingOrder
2020-10-26 15:38:42 -06:00
Marc de Lima Lucio
79ba133a07
NEW: ref in product customer price: fix missing language key
2020-10-26 13:05:26 +01:00
jpb
63c82b47fe
Merge branch '11.0_currencyRateEditor' of github.com:atm-jpb/dolibarr into develop_editorRate
2020-10-23 12:27:14 +02:00
jpb
1ecff0a608
add list and crud
2020-10-23 11:58:25 +02:00
ptibogxiv
f3848dac1e
FIX lang to #15055
2020-10-22 20:06:56 +02:00
Laurent Destailleur
8074d2cc1d
NEW Add validation of MX domain for emails
2020-10-22 20:01:59 +02:00
Florian HENRY
d347af385b
new: add PDFInvoiceSituation translation key for PDF title
2020-10-21 13:47:40 +02:00
Laurent Destailleur
a729bff062
Fix trans
2020-10-21 11:54:18 +02:00
Laurent Destailleur
ef182bed07
Fix browser reminder
2020-10-18 14:00:47 +02:00
Laurent Destailleur
7b20e703ee
Clean code
2020-10-17 15:53:31 +02:00
Laurent Destailleur
5df1218d9f
Enhance page to setup email templates
2020-10-17 12:59:22 +02:00
Laurent Destailleur
e3552e7e02
Clean code
2020-10-16 20:17:54 +02:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType
...
NEW : Nature of product is now a dictionay
2020-10-15 21:07:42 +02:00
Florian HENRY
0cb04d14d7
NEW: Thirdparty module : box on customer/supplier tab for outsantding amount late
2020-10-15 12:20:37 +02:00
Florian HENRY
fd1fa1c777
Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType
2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa
add correct import and dict edition
2020-10-14 16:39:42 +02:00
Laurent Destailleur
a0b17635fd
NEW When creating a user from a member linked to a thirdparty, you can
...
decide if it is an internal or external (default) user.
2020-10-14 14:02:07 +02:00
Laurent Destailleur
02fcee5d94
Fix make the default sender email mandatory into setup (if not defined,
...
no emails can be sent).
2020-10-14 12:21:31 +02:00
Laurent Destailleur
969ed4acc1
Better label for status schedule of cron tasks.
2020-10-13 11:52:20 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport
...
NEW module Intracomm report
2020-10-12 13:35:58 +02:00
Laurent Destailleur
b27c95bab0
Merge pull request #14989 from FHenry/dev_finish_packingfeature
...
fix : finish packging feature (allow to edit packaging quantity)
2020-10-12 13:05:34 +02:00
Laurent Destailleur
a514c20183
Add warning if we try to add a task on a draft project
2020-10-12 12:53:57 +02:00
Laurent Destailleur
d831edb481
Fix bad popup
2020-10-12 12:33:58 +02:00
Florian HENRY
1f6a99e361
Merge github.com:Dolibarr/dolibarr into dev_finish_packingfeature
2020-10-12 11:11:23 +02:00
Florian HENRY
df4b208de1
fix: add missing edit field with pakaging option on
2020-10-12 11:10:49 +02:00
Alexandre SPANGARO
8876457b54
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-10 06:47:05 +02:00
Laurent Destailleur
967e7997e6
Trans and clean code
2020-10-09 19:34:57 +02:00
Laurent Destailleur
a23a91a4b9
Merge pull request #14971 from TobiasSekan/GlobalPaymentSearch
...
NEW: Add global search for customer payments and vendor payments
2020-10-09 13:56:52 +02:00
Laurent Destailleur
4eaf2c0350
Fix regression
2020-10-09 11:49:45 +02:00
Sekan, Tobias
35fbc602ee
Add global payment search
2020-10-09 09:22:26 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Laurent Destailleur
213cefb570
Merge pull request #14941 from aspangaro/13a22
...
WIP NEW Add clone functionality on miscellaneous payment
2020-10-07 15:31:09 +02:00
Laurent Destailleur
8febb19b50
Translation
2020-10-07 01:12:27 +02:00
Laurent Destailleur
294688891d
CSS
2020-10-07 01:10:26 +02:00
Laurent Destailleur
4701656d95
Fix look and field v13
2020-10-06 13:08:20 +02:00
Laurent Destailleur
1c38379622
Better message
2020-10-06 12:22:58 +02:00
Laurent Destailleur
38acd83f4d
Review some titles and tooltip help to be more clear.
2020-10-06 12:17:33 +02:00
Laurent Destailleur
c5c8bd7838
Merge pull request #14937 from aspangaro/13a21
...
NEW Accountancy - Move to real ledger, real journals, menu disposition
2020-10-06 10:04:41 +02:00
Alexandre SPANGARO
050a4770d3
WIP NEW Add clone functionality on miscellaneous payment
2020-10-06 10:04:15 +02:00
Laurent Destailleur
7c6c319607
Trans
2020-10-06 09:31:54 +02:00
Alexandre SPANGARO
6a0f2233a6
NEW Accountancy - Move to real ledger, real journals, menu disposition
2020-10-05 21:44:39 +02:00
Laurent Destailleur
73b40828c8
Trans
2020-10-05 18:15:37 +02:00
Laurent Destailleur
9b768b5eab
Merge pull request #14926 from aspangaro/13a17
...
NEW Accountancy - Add chart of sub accounts
2020-10-05 17:20:14 +02:00
Laurent Destailleur
23f1137c84
Merge pull request #14920 from rabib-metroworks/import-vendor-invoice
...
NEW Can import Supplier invoice
2020-10-05 16:44:49 +02:00
Alexandre SPANGARO
8ee7861276
Typo
2020-10-05 10:11:19 +02:00
Alexandre SPANGARO
cab6ef092f
NEW Accountancy - Add chart of sub accounts
2020-10-05 10:05:21 +02:00
Laurent Destailleur
62177edab1
NEW Can force the antivirus from conf file or autoprepend ini setup.
2020-10-05 05:00:59 +02:00
Laurent Destailleur
fb15277c15
Better tooltip
2020-10-04 23:53:15 +02:00
Ahmad Jamaly Rabib
66a1aa9a86
NEW ADDED IMPORT TOOL FOR SUPPLIER INVOICE
...
Added supplier invoice import functionality in import module
2020-10-05 00:39:35 +06:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields
2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm
2020-10-02 00:21:13 +02:00
Laurent Destailleur
580df3d503
Merge pull request #14880 from rabib-metroworks/import-proposal
...
NEW Can import proposals
2020-10-01 19:09:14 +02:00
Laurent Destailleur
298e94e574
Typo
2020-10-01 11:16:43 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Laurent Destailleur
9447eb2873
Typo
2020-10-01 09:50:09 +02:00
Laurent Destailleur
75ff2eb642
Typo
2020-10-01 09:39:18 +02:00
Laurent Destailleur
91f0429bd2
Fix mention for france, only for FR country
2020-10-01 09:34:10 +02:00
Ahmad Jamaly Rabib
0b35a07290
NEW ADDED IMPORT TOOL FOR PROPOSAL MODULE
...
Added proposal import functionality in import module
2020-10-01 11:52:56 +06:00
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
Laurent Destailleur
1f8f2c0cc3
NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr
2020-09-29 13:13:47 +02:00
Laurent Destailleur
0093671a04
Merge pull request #14846 from aspangaro/13a19
...
NEW Add export for various payment
2020-09-28 17:40:18 +02:00
Laurent Destailleur
2cbec87ddc
Update accountancy.lang
2020-09-28 17:20:41 +02:00
Alexandre SPANGARO
88772726d7
New Add export for various payment
2020-09-28 09:32:49 +02:00
Alexandre SPANGARO
347537a205
Accountancy - Some fix
2020-09-28 06:44:01 +02:00
Laurent Destailleur
4a7df01339
Fix the MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD should be
...
MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD
2020-09-27 19:31:54 +02:00
Laurent Destailleur
4ca481335b
Merge pull request #14812 from atm-john/13.0_new_pdf_storm_for_delivery
...
NEW PDF model storm for delivery
2020-09-27 18:28:22 +02:00
Laurent Destailleur
96ae9c11f6
Revert "NEW Better currency rate editor"
2020-09-27 18:03:56 +02:00
Laurent Destailleur
cdc54a9f4a
Merge pull request #14820 from ATM-Consulting/new/develop/currency_rate_editor
...
NEW Better currency rate editor
2020-09-27 17:57:16 +02:00
Laurent Destailleur
cb6e4d131f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-27 17:13:41 +02:00
Laurent Destailleur
52d1f57276
Merge pull request #14828 from TobiasSekan/NewAllowReopenIntervention
...
NEW Allow to reopen interventions (green button)
2020-09-27 17:07:45 +02:00
Laurent Destailleur
d60ab93783
Typo
2020-09-27 16:59:27 +02:00
Laurent Destailleur
43cc009b54
Typo
2020-09-27 16:27:42 +02:00
Laurent Destailleur
3ee2459dc7
Enhancement for #14835 : Can filter on expiration date, add list of
...
members without subscriptions
2020-09-27 16:03:20 +02:00
Laurent Destailleur
5d0c40c658
FIX for #14835
2020-09-27 15:08:15 +02:00
Sekan, Tobias
6fbc536061
Remoeve double lang entry
2020-09-25 08:15:20 +02:00
Sekan, Tobias
00951a8144
New allow to reopen interventions
2020-09-25 08:10:48 +02:00
Laurent Destailleur
09c6761dae
NEW Include the tag editor of page as a popup into website editor
2020-09-23 16:36:19 +02:00
Florian Mortgat
70a0b6b90f
Merge branch 'new/11.0_multicurrency_rate_editor' into new/develop/currency_rate_editor
2020-09-23 16:03:10 +02:00
John Botella
d3c9a035e9
Add new PDF model storm for delivery
2020-09-23 15:18:53 +02:00
Florian Mortgat
f97e9e4330
FIX: URL parameters vs. POST, tokens, use class CurrencyRate for CRUD
2020-09-23 14:22:27 +02:00
Florian Mortgat
592789c597
Exchange rate editor: +filters
2020-09-22 18:34:59 +02:00
Laurent Destailleur
e4bd75dbdc
Enhancement for #14589
2020-09-22 16:26:53 +02:00
Florian Mortgat
b3f911f810
WIP: rate editor
2020-09-22 16:10:28 +02:00
Laurent Destailleur
288fd5566f
FIX #14776
2020-09-22 16:02:00 +02:00
Laurent Destailleur
d21ee07afc
NEW Can define date range of validity of a login during creation
2020-09-22 14:45:19 +02:00
Laurent Destailleur
830bc7d871
Look and feel v13
2020-09-22 09:42:44 +02:00
Laurent Destailleur
aee6bc173f
WIP Add start/end date of validity for user/logins
2020-09-21 18:44:20 +02:00
Laurent Destailleur
ab94224d0c
Merge pull request #14668 from OPEN-DSI/email_smtp_allow_auto_signed
...
NEW : Email configuration - Allow auto signed certificat when smtp ssl activated
2020-09-20 17:56:23 +02:00
Laurent Destailleur
a3defd621c
Merge pull request #14726 from aspangaro/13a15
...
Fix display on quickadd dropdown menu
2020-09-20 17:30:35 +02:00
Laurent Destailleur
14aa9c01da
Neutral message if login / email exists #yohosha4542
2020-09-19 18:40:00 +02:00
Laurent Destailleur
b1985950a6
Use POST to make the ajax set/del constant
2020-09-19 12:50:47 +02:00
Laurent Destailleur
f62d52f89a
Fix tooltip for linkto object.
...
Fix security of ajax selectobject.php
2020-09-19 00:44:47 +02:00
Laurent Destailleur
4f2d3176f5
Fix #yogosha4533
2020-09-18 23:26:05 +02:00
Laurent Destailleur
534846c5c7
NEW Framework is ready for CSRF token protection on explicit GET URLs.
2020-09-18 04:30:24 +02:00
Laurent Destailleur
27d03a2034
Better support of SFTP for the FTP module
2020-09-18 00:36:24 +02:00
Laurent Destailleur
e123a4cb84
Fix help on minimum nb of chars
2020-09-17 15:09:29 +02:00
Laurent Destailleur
16b9e62866
FIX #yogosha4456
2020-09-17 14:20:37 +02:00
Laurent Destailleur
b5cac258bf
Merge pull request #14739 from defrance/patch-155
...
Users can now have non-binary gender
2020-09-16 00:54:07 +02:00
Laurent Destailleur
5c31593d43
Add date of birth in candidatures
2020-09-16 00:47:44 +02:00
Laurent Destailleur
51963f4c2a
css
2020-09-15 13:48:48 +02:00
BENKE Charlene
0aa97a8b02
Update main.lang
2020-09-15 10:59:07 +02:00
Laurent Destailleur
59c10235b5
Show reminders on the event page
2020-09-14 21:06:40 +02:00
Laurent Destailleur
f626bd70d0
Look and feel v13
2020-09-14 20:53:42 +02:00
Laurent Destailleur
8afd448def
Add warning if a hidden option is on to encourage to remove it.
2020-09-14 15:05:35 +02:00
Laurent Destailleur
550cec06a4
Look and feel v12
2020-09-14 14:41:11 +02:00
kkhelifa-opendsi
1f5f784b75
Merge branch 'develop' into email_smtp_allow_auto_signed
2020-09-14 10:25:15 +02:00
Laurent Destailleur
419ac91a7a
FIX #14538
2020-09-14 03:34:03 +02:00
Laurent Destailleur
bd8185fb49
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-14 02:49:35 +02:00
Laurent Destailleur
59bc8ee07c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/stats/byproperties.php
htdocs/adherents/stats/geo.php
htdocs/admin/system/dolibarr.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_title.tpl.php
htdocs/langs/en_US/admin.lang
htdocs/product/class/product.class.php
2020-09-14 02:49:19 +02:00
Laurent Destailleur
3cb77d2e75
Merge pull request #14704 from aspangaro/13a12
...
New Accountancy - Add default account for customer deposit
2020-09-14 01:13:17 +02:00
Laurent Destailleur
dad02afa22
Update accountancy.lang
2020-09-14 01:13:07 +02:00
Laurent Destailleur
a4fb16b4f3
Add a warning to warn about security leak
2020-09-14 00:03:49 +02:00
Alexandre SPANGARO
2ae91b131f
Fix display on quickadd dropdown menu
2020-09-13 22:17:24 +02:00
jove@bisquerra.com
e55c16c039
NEW Weighing Scale compatibility with TakePOS connector
2020-09-13 21:12:14 +02:00
Laurent Destailleur
7d25de5713
Enhance setup page for email setup
2020-09-12 15:39:14 +02:00
Laurent Destailleur
5ea3f09e17
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/translate.class.php
2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
2020-09-12 04:25:54 +02:00
Laurent Destailleur
4b525f6826
Debug notifications on browser
2020-09-12 04:12:39 +02:00
Laurent Destailleur
9dad8f0fb7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-12 03:02:27 +02:00
Laurent Destailleur
f45054df06
Close #14604 Merge manually change to get notification to show
...
Remains: support call of the action=closereminderid done by browser once
notif has be thrown.
2020-09-12 03:02:08 +02:00
Laurent Destailleur
1bdd4cae9b
Merge pull request #14699 from atm-adrien/NEW_add_widget_empty_tasks
...
New add widget empty tasks
2020-09-12 01:18:50 +02:00
Laurent Destailleur
5c776ccf3f
Merge pull request #14708 from TobiasSekan/AddGlobalMiscPaymentSearch
...
NEW Add global search for miscellaneous payments
2020-09-12 01:13:26 +02:00
Laurent Destailleur
7e989c8902
Remove TODO: Button Close possible only if production has started.
2020-09-11 12:36:31 +02:00
Sekan, Tobias
25d6af2b86
Add global search for misc payments +TODO
2020-09-11 09:55:34 +02:00
Alexandre SPANGARO
5b364fc5fa
New Accountancy - Add default account for customer deposit
2020-09-10 21:56:55 +02:00
Laurent Destailleur
0d124730a8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/list.php
2020-09-10 18:05:18 +02:00
Laurent Destailleur
3eba707e0f
Trans
2020-09-10 17:09:32 +02:00
Adrien Raze
b4942707bb
EN_US Traductions
2020-09-10 11:23:45 +02:00
Adrien Raze
76d5ce18ca
Titres + lien cliquable client + traductions
2020-09-10 11:12:04 +02:00
Laurent Destailleur
08ab4855f2
Merge branch 'develop' into 13a11
2020-09-09 19:12:08 +02:00
Laurent Destailleur
abd1b1b4a9
Merge pull request #14657 from TobiasSekan/AddMissingTranslationsForPermissions
...
FIX Add missing translations for permissions
2020-09-09 15:27:22 +02:00
kamel
ccff18e2a5
NEW : Email configuration - Allow auto signed certificat when ssl activated
2020-09-08 14:48:50 +02:00
Laurent Destailleur
54c0f673c1
Debug hidden option MAIN_USE_EXPENSE_IK
2020-09-08 12:00:14 +02:00
Laurent Destailleur
86ed4dfa2b
Debug hidden option MAIN_USE_EXPENSE_IK
2020-09-08 11:51:36 +02:00
Alexandre SPANGARO
d1ba6b9476
Merge remote-tracking branch 'upstream/develop' into 13a11
2020-09-08 05:01:36 +02:00
Alexandre SPANGARO
939933f4f7
Add some language key
2020-09-08 04:24:18 +02:00
Laurent Destailleur
f5eb8b0108
Look and feel v13
2020-09-08 04:21:35 +02:00
Laurent Destailleur
4db561656e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-08 02:11:23 +02:00
Laurent Destailleur
1a67b4efeb
Debug
2020-09-08 02:11:09 +02:00
Alexandre SPANGARO
871826d023
Merge remote-tracking branch 'upstream/develop' into 13a8
2020-09-07 21:22:14 +02:00
Laurent Destailleur
e7ad8ef3a7
Translation missing
2020-09-07 14:47:25 +02:00
Sekan, Tobias
16bb33b619
Add missing translations for permissions
2020-09-07 14:29:36 +02:00
Laurent Destailleur
92e231e121
Merge pull request #14652 from atm-john/12.0_fix_lang_retained_warranty
...
FIX: lang fr retained warranty
2020-09-07 12:46:32 +02:00
John Botella
10d3405219
FIX: lang fr retained warranty
2020-09-07 12:21:00 +02:00
Laurent Destailleur
5a471d38c2
Merge pull request #14611 from atm-adrien/NEW_propal_massAction_validate_sign
...
New : add massActions "Validate" and "Sign"
2020-09-07 12:13:29 +02:00
Laurent Destailleur
1f6c0997f4
Add info when job is closed
2020-09-06 20:48:13 +02:00
Laurent Destailleur
263989019c
Merge pull request #14493 from aspangaro/13a4
...
NEW Accountancy - Add options to disable accounting on sales, purchases & expense reports
2020-09-04 23:10:15 +02:00
Laurent Destailleur
f04b5c48ea
Update accountancy.lang
2020-09-04 23:09:34 +02:00
Alexandre SPANGARO
247cc71ef4
Merge remote-tracking branch 'upstream/develop' into 13a8
2020-09-04 20:26:05 +02:00
Adrien Raze
bcd9a0b29f
Retours PR
2020-09-03 14:25:17 +02:00
Laurent Destailleur
9868140693
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-02 19:20:12 +02:00
Laurent Destailleur
4dca1929e0
Can close a recruitment job
2020-09-02 19:19:47 +02:00
Adrien Raze
d6113acfc8
action presign/prevalidate + action sign/validate + Traductions
2020-09-02 15:20:10 +02:00
atm-lena
7b91c8efc8
Event Reminder : Add "Default Mail Model" to select Mail Model
2020-09-02 09:58:55 +02:00
Laurent Destailleur
def2bd5d6d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-01 16:36:26 +02:00
Alexandre SPANGARO
0336fe5686
NEW Accountancy - On transfers, select the periodicity by default
2020-09-01 16:18:07 +02:00
Laurent Destailleur
5d40380a07
Add index on status
2020-09-01 15:17:52 +02:00
atm-lena
d2ed43d913
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
2020-09-01 09:43:14 +02:00
Laurent Destailleur
d69f08e489
WIP
2020-09-01 01:24:05 +02:00
Laurent Destailleur
ffb3d810de
Complete fix for #14580 for v10 (backport of change of develop)
2020-08-31 16:21:59 +02:00
atm-lena
f8c79db4a9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
2020-08-31 14:14:27 +02:00
Laurent Destailleur
0d4f7cb485
Fix responsive and title of reports
2020-08-30 17:42:49 +02:00
Laurent Destailleur
d94d7a1d0b
Sync transifex
2020-08-30 16:28:07 +02:00
Laurent Destailleur
60ead7cefd
Trans
2020-08-30 13:22:12 +02:00
Laurent Destailleur
3bef07697c
Trans
2020-08-30 13:17:25 +02:00
Laurent Destailleur
e030b2089a
Look and feel v13
2020-08-30 13:14:28 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
...
Agenda Remind (Part 1)
2020-08-29 05:19:21 +02:00
Laurent Destailleur
a1a05d55e4
Update admin.lang
2020-08-29 05:03:44 +02:00
Laurent Destailleur
e9c6911a23
Update admin.lang
2020-08-29 05:03:01 +02:00
Laurent Destailleur
04ad25d90f
NEW Add the workflow interaction close intervention on closing ticket
2020-08-28 19:07:17 +02:00
Laurent Destailleur
9cd63d68bd
Update admin.lang
2020-08-28 17:58:02 +02:00
Laurent Destailleur
4ecd15b7ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
2020-08-27 21:57:42 +02:00
Laurent Destailleur
5c1680e9c5
Merge branch 'develop' into master
2020-08-27 19:58:29 +02:00
Laurent Destailleur
8b95aa63eb
Trans
2020-08-27 18:59:36 +02:00
atm-lena
c0f254d10c
Translation + decode
2020-08-27 16:03:25 +02:00
atm-lena
e3ce3cbb7c
Function sendEmailsReminder()
2020-08-27 15:49:56 +02:00
atm-lena
f57325237a
WIP : sendEmailsReminder()
2020-08-27 12:30:59 +02:00
atm-lena
acb50950a4
Add a default message to "actioncomm_send" template
2020-08-27 11:31:48 +02:00
atm-lena
bbc554070c
Fix
2020-08-27 09:33:40 +02:00
atm-lena
6a60228bc3
Translation
2020-08-26 17:11:32 +02:00
atm-lena
efe60ebc58
Error management
2020-08-26 17:02:34 +02:00
atm-lena
1267e914dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind
2020-08-26 15:16:53 +02:00
atm-lena
a4018f41f7
WIP
2020-08-26 10:52:36 +02:00
atm-lena
7df993c7ed
Add "select_model_mail" function + add select to create event
2020-08-25 17:26:32 +02:00
atm-lena
6a94c0f52f
Add model type mail
2020-08-25 16:43:57 +02:00
Laurent Destailleur
7c39543c72
Support trigger in module recruitment
...
Enhance generic code of automatic recording events
2020-08-25 12:47:38 +02:00
Alexandre SPANGARO
335f57f9be
Fix language
2020-08-24 11:41:00 +02:00
Laurent Destailleur
b600478a5a
Work on recruitment module
2020-08-23 22:11:16 +02:00
Laurent Destailleur
6685cc5bc8
Update admin.lang
2020-08-23 18:07:18 +02:00
Laurent Destailleur
9b7691c8d2
Update admin.lang
2020-08-23 18:04:02 +02:00
Laurent Destailleur
34d2d9a7c6
Look and feel v13
2020-08-23 15:17:22 +02:00
Laurent Destailleur
46a6161323
Trans
2020-08-23 13:30:05 +02:00
Alexandre SPANGARO
bf28201685
Fix Missing language key
2020-08-23 07:13:43 +02:00
Laurent Destailleur
a265bec7ca
NEW Events in agenda for contact
...
FIX Saving contacts of an events
2020-08-23 02:38:56 +02:00
jove@bisquerra.com
d9cbd8f998
NEW: Print payment method and change in TakePOS
2020-08-22 18:28:15 +02:00
Laurent Destailleur
23cda5f464
Enhance recruitment module
2020-08-22 14:37:09 +02:00
Laurent Destailleur
ac1ae7a0d2
Debug
2020-08-22 04:05:31 +02:00
Laurent Destailleur
dabe804299
Add numbering modules for candidatures. Mass action Validate.
2020-08-22 03:49:46 +02:00
Laurent Destailleur
b80ba1179f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/accountancy/expensereport/lines.php
htdocs/accountancy/supplier/lines.php
2020-08-21 13:19:28 +02:00
Laurent Destailleur
220fc6db98
Work on recruitment module
2020-08-21 13:00:12 +02:00
Alexandre SPANGARO
065ace5301
Fix Missing language key on rights
2020-08-21 05:26:07 +02:00
Alexandre SPANGARO
76315fa6ac
Fix Missing language key on rights
2020-08-21 05:22:31 +02:00
Alexandre SPANGARO
dd87362ce3
Fix Missing language key on rights
2020-08-21 05:20:53 +02:00
Alexandre SPANGARO
646d5cc9c8
Fix Missing language key on rights
2020-08-21 05:19:57 +02:00
Alexandre SPANGARO
881a9b7c04
Fix Missing language key on rights
2020-08-21 05:10:19 +02:00
Alexandre SPANGARO
bd5e35c15f
Fix Missing language key
2020-08-21 05:00:38 +02:00
Laurent Destailleur
b2ed69100b
Trans
2020-08-21 01:18:06 +02:00
Laurent Destailleur
ad0625b6ec
Debug posting message from ticket page
2020-08-21 01:11:22 +02:00
Laurent Destailleur
3ebcd191bd
NEW Add filter rules "is answer" and "is not answer" in email collector
2020-08-20 20:16:38 +02:00
Laurent Destailleur
605642d96a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-20 19:01:03 +02:00
Laurent Destailleur
66f9f37f41
Minor code and doc enhancement
2020-08-20 19:00:43 +02:00
Laurent Destailleur
fbb162aa9b
Trans
2020-08-20 12:21:40 +02:00
Laurent Destailleur
25dfd32e0b
Merge pull request #14456 from andreubisquerra/master
...
NEW: Delayed payment in TakePOS
2020-08-19 14:36:34 +02:00
Laurent Destailleur
6ce9d573e2
Trans
2020-08-18 14:13:36 +02:00
Laurent Destailleur
e65e4a6d47
Beautify for of member module
2020-08-18 11:52:00 +02:00
Alexandre SPANGARO
3e80c71713
NEW Accountancy - Add options to disable binding on sales, purchases & expense reports independently of the modules
2020-08-18 07:38:46 +02:00
Laurent Destailleur
b623d79525
Merge pull request #14488 from egils-consulting/patch-10
...
Update admin.lang
2020-08-17 22:21:09 +02:00
Laurent Destailleur
24703b8fe7
Merge pull request #14487 from aspangaro/13a4
...
NEW Add a start date to begin binding in accountancy
2020-08-17 22:20:46 +02:00
Laurent Destailleur
bdcb945dda
Work on inventory
2020-08-17 16:04:12 +02:00
Egil Priskorn
bf18f56056
Update admin.lang
...
Small typo
2020-08-17 15:33:36 +02:00
Alexandre SPANGARO
498431fa6f
NEW Add a start date to begin binding in accountancy
2020-08-17 15:27:05 +02:00
Laurent Destailleur
75d368b706
Better translation of option
2020-08-17 14:08:52 +02:00
Laurent Destailleur
816aeadcba
Merge pull request #14465 from atm-john/develop_declinaison_price_multiple_merge
...
NEW : Declinaison price level compatibility
2020-08-16 23:18:49 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
Laurent Destailleur
f6c1a14d50
CSS
2020-08-14 21:22:45 +02:00
Laurent Destailleur
a916f6af59
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-08-14 11:09:06 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0
...
Conflicts:
htdocs/product/composition/card.php
2020-08-14 11:06:39 +02:00
Laurent Destailleur
2b393d04e1
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 11.0
2020-08-14 11:03:48 +02:00
Laurent Destailleur
d35c7ed49b
Fix trans
2020-08-14 11:03:12 +02:00
Laurent Destailleur
f0046672fc
Merge pull request #14461 from atm-john/NEW_fill_service_dates
...
NEW: new line template: hidden conf to fill service dates from the last service line
2020-08-14 02:50:24 +02:00
Laurent Destailleur
88c07e86ad
Organization of setup for Takepos bar features
2020-08-13 13:46:53 +02:00
John Botella
41cbe6db12
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_declinaison_price_multiple_merge
2020-08-12 10:39:21 +02:00
John Botella
f0268b4aaf
Add declinaison price level
2020-08-12 10:14:29 +02:00
John Botella
47e664df8d
Merge tag 'develop' of github.com:Dolibarr/dolibarr into NEW_fill_service_dates
2020-08-11 12:28:40 +02:00
jove@bisquerra.com
3be723f3a1
NEW: Delayed payment in TakePOS
2020-08-11 07:49:54 +02:00
John Botella
f014365b65
Fix lang fr
2020-08-10 10:35:50 +02:00
Laurent Destailleur
f132f272f2
Fix missing translation
2020-08-07 14:38:42 +02:00
Laurent Destailleur
7e15abc972
Fix missing translation
2020-08-07 14:34:21 +02:00
Laurent Destailleur
1bb24de555
Can set the language of a user.
2020-08-07 14:22:43 +02:00
Laurent Destailleur
e72e05d5f5
Add field default_lang for users
2020-08-07 13:31:23 +02:00
Laurent Destailleur
e830e7f3d3
Work on recruitment module
2020-08-06 13:14:43 +02:00
Laurent Destailleur
9d79e984dd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:15:04 +02:00
Laurent Destailleur
1cf3422e05
FIX Bad adress of vendor in PDF for PDF of supplier payment
...
FIX dol_convertToWord() Bad conversion of number into a string
2020-08-06 01:56:42 +02:00
Laurent Destailleur
1f02b33195
Work on inventory
2020-08-05 12:25:26 +02:00
Laurent Destailleur
9d4e672475
FIX Debug direct debit module and credit transfer module
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
2020-08-04 21:12:03 +02:00
Laurent Destailleur
5189e8beea
FIX Debug direct debit module and credit transfer module
2020-08-04 20:26:57 +02:00
Laurent Destailleur
da76775fbd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/factures.php
htdocs/compta/prelevement/fiche-rejet.php
2020-08-03 21:18:45 +02:00
Laurent Destailleur
f62717a16a
FIX Debug module direct debit order. Solve conflict with credit transfer
2020-08-03 20:16:33 +02:00
Laurent Destailleur
fb811a1656
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/commonobject.class.php
htdocs/langs/fr_FR/withdrawals.lang
htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
e64b8eaf40
Fix debug credit transfer module
2020-08-03 11:21:13 +02:00
Laurent Destailleur
679625daee
Trans
2020-08-03 09:51:15 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact
...
NEW: Add prospect status managment for the contact with managment of custom icon
2020-08-02 22:01:00 +02:00
