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

4516 Commits

Author SHA1 Message Date
Laurent Destailleur
63fe4615aa
Merge pull request #23065 from FHenry/dev_add_PropalNotificationTriggers 
NEW: Notification for Sign or Refused Propal from Online Page
 2022-12-17 02:15:02 +01:00
Gauthier PC portable 024
9b548e4125 FIX : "read" right of hrm evaluations must allow to see only user evaluations and those of subordinates, readall is another right + several fixes 2022-12-15 16:08:44 +01:00
VESSILLER
88ab5d7203 NEW Quadratus export with attachments in accountancy export 2022-12-13 15:48:00 +01:00
Laurent Destailleur
7e80c626df Trans 2022-12-09 00:54:43 +01:00
VESSILLER
d5e6c08319 NEW operation type in email collector to load or create contact 2022-12-01 16:50:32 +01:00
Florian HENRY
8202bc6930 NEW: Notification for Sign or Refused Propal from Online Page 2022-12-01 13:56:14 +01:00
Florian HENRY
c101acb3ce Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_OrderNotificationTriggers 2022-11-30 08:16:53 +01:00
hystepik
71090cbdd8 test to do 2022-11-28 14:57:51 +01:00
EchoLoGeek
3b9122bada
Update main.lang 2022-11-25 22:37:13 +01:00
Laurent Destailleur
b04d4dd867
Merge pull request #22689 from bb2a/NEW---Compléte-function-pdfBuildThirdpartyName-to-use-company-name-of-contact 
NEW Make option PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME visible
 2022-11-25 16:49:35 +01:00
VESSILLER
fcc7965a78 FIX resolve conflicts 2022-11-24 15:04:12 +01:00
Florian HENRY
0b4d8775b4 add good text 2022-11-23 14:00:24 +01:00
Faustin
1b5bbf72fc Limit partnership creation on public page by ip adress 2022-11-23 13:41:02 +01:00
Florian HENRY
d59391aaf2 NEW: Add Customer Order delivered (ORDER_CLOSE) in module Notification 2022-11-23 13:08:09 +01:00
Faustin
725e75fbc9 massaction to affect users on projects 2022-11-08 14:59:22 +01:00
Laurent Destailleur
1bc3b44e58
Merge pull request #22695 from FHenry/dev_new_allowdownloadlink_option_in_conf_module 
NEW: Allow download link option in module configuration (propal,invoice,supplier proposal, order)
 2022-11-02 00:43:23 +01:00
Laurent Destailleur
cb15e1ea8a
Merge pull request #22705 from fboitel/NEW#22622-thirdparty-partnership 
NEW #22622: all partneships displayed on tab partnership of thirdparties and members
 2022-11-01 21:11:06 +01:00
Faustin
71e55ab709 Translation update 2022-10-30 02:37:56 +01:00
Faustin
d15493e50d massacrtion for updating product prices 2022-10-30 02:59:11 +02:00
Faustin
bc4b9c4b18 NEW #22622: all partneships displayed on tab partnership of thirdparty and member 2022-10-29 09:39:12 +02:00
Florian HENRY
185d573205 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_allowdownloadlink_option_in_conf_module 2022-10-28 10:40:59 +02:00
Florian HENRY
b3c7d64cb2 NEW: Allow download link in module configuration (propal,invoice,supplier proposal, order) 2022-10-28 10:40:43 +02:00
Anthony Berton
cacb642bc0 NEW - Compléte function pdfBuildThirdpartyName to use company name of contact 2022-10-27 22:45:32 +02:00
Laurent Destailleur
68e1509834 Fix ckeditor 2022-10-24 22:38:45 +02:00
Laurent Destailleur
bd617965a7
Merge pull request #22556 from fboitel/NEW#22546-massaction-supervisor 
NEW #22546 : can now set user supervisors using mass action in htdocs…
 2022-10-13 00:31:30 +02:00
Faustin
168ea58a07 NEW #22546 : can now set user supervisors using mass action in htdocs/user 2022-10-12 18:59:05 +02:00
Laurent Destailleur
9ce11683de Transifex sync 2022-10-12 16:38:10 +02:00
Laurent Destailleur
5fc1ce5491 Translation 2022-10-08 17:09:31 +02:00
Laurent Destailleur
b53b0e4f9b
Merge pull request #22429 from fboitel/NEW#22328 
NEW #22328
 2022-10-04 17:49:02 +02:00
Laurent Destailleur
1b8442962e
Merge pull request #22458 from fboitel/NEW#22424 
NEW #22424
 2022-10-04 17:43:27 +02:00
lvessiller
f43056a76f Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-event-list-with-color 2022-10-03 14:33:32 +02:00
mikygee
eb6752de88 Correction bug #22469 Especes is only written with plurial 2022-10-02 01:24:34 +02:00
Faustin
800dab111b Precision 'signed' for download link after document is signed 2022-09-29 14:54:44 +02:00
Faustin
30c3543d20 Online pdf contract signature 2022-09-29 14:28:58 +02:00
Laurent Destailleur
fb28d14097 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-28 21:20:37 +02:00
Laurent Destailleur
3e9e17c746 Debug tooltip of import tool 2022-09-28 16:55:51 +02:00
Faustin
1ba48092ae Messages added 2022-09-27 11:09:09 +02:00
Laurent Destailleur
5139a1afab
Merge pull request #22331 from atm-lena/develop_FIX_BOMServices_CostCalculWorkstation_ErrorTrad 
Error Trad
 2022-09-24 13:24:45 +02:00
Laurent Destailleur
36e1bfb297 NEW Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing wh on PDF 2022-09-21 00:50:04 +02:00
atm-lena
69fc6172f9 Error Trad 2022-09-20 10:04:21 +02:00
Laurent Destailleur
d19bb01f03
Merge pull request #22303 from atm-lena/develop_FIX_BOMServices_CostCalculWorkstation 
Bom services : fix calcul of cost for line without workstation
 2022-09-20 00:08:52 +02:00
Laurent Destailleur
fa58d35fa1 Clean code 2022-09-19 19:46:14 +02:00
Faustin
0fed5dbb3d NEW: possibility to select scopes with checkbox for oauth tokens 2022-09-18 02:21:46 +02:00
atm-lena
5843cc8cb6 Bom services : fix calcul of cost for line without workstation 2022-09-16 11:11:20 +02:00
Laurent Destailleur
7dbde6f934
Merge branch 'develop' into develop_NEW_Service_DefaultWorkstation 2022-09-13 01:38:49 +02:00
Laurent Destailleur
6b3095ae9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 14:10:28 +02:00
Laurent Destailleur
fc91d8fc4e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-08 14:02:56 +02:00
Laurent Destailleur
044d2baca1 Sync transifex 2022-09-08 14:02:21 +02:00
atm-lena
81ed97e9fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-09-08 11:21:05 +02:00
Gauthier PC portable 024
e1bf5a5e6b FIX : Recursively retrieves all parent bom in the tree that leads to the $bom_id bom to check if we're allowed to add bom as bomline 2022-09-01 17:16:59 +02:00
Frédéric FRANCE
ec764595f8 enhance bank display for user 2022-08-29 16:59:23 +02:00
atm-lena
6e5d395ac8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-24 11:38:19 +02:00
Laurent Destailleur
83ace0cb12
Merge pull request #21655 from rycks/14.0-add_account_number_on_invoices_for_debit 
NEW #21654: add bank account number used on invoices for debit
 2022-08-23 15:46:59 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
 2022-08-12 16:03:09 +02:00
lvessiller
74a2b58e85 FIX resolve conflicts 2022-08-12 14:55:06 +02:00
Laurent Destailleur
79a5a2b3ab Transifex sync 2022-08-12 14:02:18 +02:00
atm-lena
2fbba30e2a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-11 12:11:41 +02:00
Frédéric FRANCE
b1814a45ce add oauth2 for swiftmailer 2022-08-10 09:33:58 +02:00
Laurent Destailleur
f50f8e682d
Merge branch 'develop' into 14.0-add_account_number_on_invoices_for_debit 2022-08-10 05:20:12 +02:00
lvessiller
a3b240bd3b FIX resolve conflicts 2022-08-05 11:23:02 +02:00
Eric Seigne
6e6982d365 new #21654: add bank account number used on invoices for debit 2022-08-04 09:49:44 +02:00
Faustin
29bb03a25b Conflict 2022-08-03 20:07:16 +02:00
Faustin
868d07ae96 New prop : select auth type with radio box 2022-08-03 20:01:13 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Faustin
a990480ba6 Use of oauth for smtp is available (tested only with google) 2022-08-01 11:31:32 +02:00
Laurent Destailleur
77389b3855 Fix trans 2022-07-29 17:35:39 +02:00
atm-lena
462352b957 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-29 12:06:43 +02:00
Anthony Berton
8e7fa102b8 Clean 2022-07-29 11:14:28 +02:00
Laurent Destailleur
78ee02408e
Merge pull request #21431 from fboitel/NEW-recursive-envents 
NEW : Recurrent events on agenda v1
 2022-07-27 11:01:26 +02:00
lvessiller
bae3583fe3 FIX resolve conflicts 2022-07-26 16:49:35 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
d0e74fbbeb Sync transifex 2022-07-26 10:54:03 +02:00
Laurent Destailleur
da8a9e6082
Merge pull request #20625 from Easya-Solutions/new-inventory-category-field 
NEW Can use products categories to make inventory
 2022-07-24 22:06:55 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
c7fd9f5a3a Trans 2022-07-24 10:57:46 +02:00
Laurent Destailleur
75b8246578
Merge branch 'develop' into NEW-recursive-envents 2022-07-19 19:40:48 +02:00
lvessiller
8f338d84b0 FIX resolve conflicts 2022-07-15 17:35:19 +02:00
lvessiller
cda6e9184d NEW color in action list and translated 2022-07-13 16:52:57 +02:00
Laurent Destailleur
8422d3079c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 19:10:08 +02:00
Laurent Destailleur
a1857e3e78 Trans 2022-07-12 18:43:10 +02:00
atm-lena
db5c5b9020 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 09:21:22 +02:00
Laurent Destailleur
6f1d62d8a5 Fix trans 2022-07-11 17:06:03 +02:00
Laurent Destailleur
e29df476e6
Merge branch 'develop' into membership-rework 2022-07-11 10:56:31 +02:00
Laurent Destailleur
e48fa05f9c
Merge pull request #21175 from altairis-melina/parameters 
NEW : TAKEPOS-Add setup parameters
 2022-07-11 01:54:27 +02:00
Laurent Destailleur
bd3af19978
Merge pull request #21335 from atm-GregM/NEW_exped_ObjectLink 
NEW add objectLink on expedition
 2022-07-10 19:33:49 +02:00
Yoan Mollard
07b5657ba1 Merge remote-tracking branch 'origin/develop' into HEAD 2022-07-08 10:11:22 +02:00
atm-lena
7c82fc5da6 WIP 2022-07-08 10:04:16 +02:00
atm-lena
503e2310ea WIP 2022-07-06 16:51:50 +02:00
Laurent Destailleur
9a10e3f971
Merge branch 'develop' into NEW#21395 2022-07-06 15:53:22 +02:00
atm-lena
55f0dada34 WIP 2022-07-06 13:55:43 +02:00
lvessiller
ed9c7ff251 FIX resolve conflicts 2022-07-06 09:23:44 +02:00
atm-lena
4e1dc2792c Add default workstation in service card 2022-07-05 13:58:35 +02:00
Laurent Destailleur
3c91a3a56b Clean not used files 2022-07-03 11:47:40 +02:00
Faustin
259224c3be NEW : Recurrent events on agenda v1 2022-07-02 18:48:35 +02:00
Yoan Mollard
e7058c253e NEW: Table of membership types 2022-06-29 03:25:33 +02:00
Yoan Mollard
f8af181cee Label clarification following the new per-type setting "CanEditAmount" 2022-06-29 00:28:33 +02:00
Yoan Mollard
759900bcce No longer allow to edit amount in the payment step 
If amount is editable, edition has been done in the previous screen in
public/members/new.php
It also allows the possibility to prevent the visitor from doing a >0
payment if this is not wanted.
 2022-06-29 00:27:18 +02:00
Yoan Mollard
5998999f18 NEW: Add free membership amounts at the membership type level 2022-06-28 02:33:17 +02:00
Faustin
3e66ca1636 NEW #21395 : Added picto text to inform that option does not work with all themes 2022-06-27 16:18:54 +02:00
Faustin
d7d02fee9a NEW #21395 : Added option for dark theme mode in display - color and theme 2022-06-27 16:08:06 +02:00