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

11882 Commits

Author SHA1 Message Date
Laurent Destailleur
caf999aa1f Fix scanner in inventory. Fix button must not be clicable if disabled. 2022-03-17 00:12:05 +01:00
Laurent Destailleur
54da09bb71
Merge pull request #20310 from ymollard/15.0 
Restoring missing VATIsNotUsed label (15.0)
 2022-03-16 22:38:52 +01:00
Laurent Destailleur
ef19769249
Merge pull request #20318 from Achicken7301/develop 
Vietnam date format, VAT rates
 2022-03-16 22:22:20 +01:00
Laurent Destailleur
7fb6088e10
Merge pull request #20326 from bb2a/Lang-mass-action-nosign 
FIX - Lang mass action propal noSign
 2022-03-16 22:09:12 +01:00
atm-steve
21090963e0
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-14 17:03:52 +01:00
steve
1555a95ce8 Activate new rights read and write 2022-03-14 16:50:43 +01:00
Laurent Destailleur
4b3b9ed66b Look and feel v15 2022-03-14 11:43:58 +01:00
Khang
c57336eb37
Merge branch 'Dolibarr:develop' into develop 2022-03-13 19:15:59 +07:00
Laurent Destailleur
06804c3547 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
 2022-03-11 17:04:23 +01:00
Laurent Destailleur
f72f71a972 FIX Delete of doc and package in modulebuilder 2022-03-11 16:21:28 +01:00
Laurent Destailleur
9e3742ab81 Trans 2022-03-11 13:34:14 +01:00
BB2A Anthony Berton
32b508ae19 Lang 2022-03-11 11:48:50 +01:00
Laurent Destailleur
6100bc86f8 FIX css not saved in modulebuilder 2022-03-11 10:32:06 +01:00
Khang
144a11d15e
Merge branch 'Dolibarr:develop' into develop 2022-03-11 13:09:08 +07:00
Laurent Destailleur
bc6249f0eb Better error message 2022-03-10 22:17:04 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
 2022-03-10 15:59:09 +01:00
Gauthier PC portable 024
c103c7d61e Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-03-10 10:31:56 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
Khang
d7fe48ebc0 Vietnam date format 
https://en.wikipedia.org/wiki/Date_and_time_notation_in_Vietnam
 2022-03-10 14:14:10 +07:00
Laurent Destailleur
2279674f01 Trans 2022-03-09 15:58:23 +01:00
Thomas Negre
07672b23b9 Langs/bills.lang: add error string for invoice date check 2022-03-09 09:25:52 +01:00
Yoan Mollard
8f7c361a12 Restoring missing VATIsNotUsed label 
Overwritten by a transiflex sync
 2022-03-09 01:32:59 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
Marc de Lima Lucio
f837845c12 FIX: still prevent project creation if PROJECTLEADER role unavailable, but with a specific error message 2022-03-08 15:07:02 +01:00
lvessiller
2561fcbb85 FIX translate update prices and add const in proposal setup 2022-03-08 10:06:57 +01:00
Quentin VIAL-GOUTEYRON
b904ea73a6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-08 08:55:21 +01:00
Laurent Destailleur
7defe26e56 Debug cron to send backup by email. 2022-03-07 17:55:10 +01:00
Laurent Destailleur
82244afb94
Merge pull request #20136 from bb2a/Send-Local-Database-Dump 
NEW -  Add util function send backup by mail
 2022-03-07 17:37:44 +01:00
Laurent Destailleur
cf0ef207b8
Update cron.lang 2022-03-07 17:37:32 +01:00
Laurent Destailleur
0020f4e48a
Merge pull request #20222 from thomas-Ngr/develop_new_ticket_notify_at_closing 
New - Ticket: notify contacts at closing
 2022-03-07 16:23:27 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
 2022-03-07 13:23:47 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered 
FIX Error management on mass action "Approve holiday"
 2022-03-07 12:01:34 +01:00
Quentin VIAL-GOUTEYRON
cc591b3a03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-07 10:12:17 +01:00
Noé Cendrier
cfabaea645 translation refining 2022-03-04 17:38:39 +01:00
Noé Cendrier
e4f4a07fc6 correct mass action "classify delivered" 2022-03-04 17:31:04 +01:00
steve
436b8fa5b5 apply feedbacks 2022-03-03 16:18:09 +01:00
lvessiller
6c172d6441 NEW option update prices on proposal cloning 2022-03-03 11:58:29 +01:00
Laurent Destailleur
aed4d69568 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-03 09:49:26 +01:00
Laurent Destailleur
2837c938e6 Fix help easier to understand to avoid lethal situations. 
Fix reponsive
 2022-03-03 09:41:15 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2022-03-03 00:16:55 +01:00
Laurent Destailleur
c452428d12 Fix label of menu 2022-03-02 22:20:05 +01:00
Steve
8f07c22d70 Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-02 14:51:46 +01:00
steve
e2f727ef55 feat: langs trans ref_employee and national registration number 2022-03-02 14:21:49 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
d76e002822 Fix explanation on setup page 2022-03-01 15:17:03 +01:00
Steve
5bf186c8ce Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-01 11:42:57 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
d101a457c1 Trans 2022-02-28 22:21:40 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
ca236c556a FIX Blocking situation when a payment was deleted in bank. 
FIX Missing or bad permissions
 2022-02-28 19:45:53 +01:00
Thomas Negre
35531b6328 add strings for email notification on ticket closing 2022-02-28 17:10:46 +01:00
Laurent Destailleur
8866d447c7 Fix error message 2022-02-28 16:01:07 +01:00
steve
08fa2dfadd wip: add read employee and write employee 2022-02-28 15:58:23 +01:00
Laurent Destailleur
40d67d70d2 Fix module partnership 2022-02-28 12:37:56 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-27 08:40:01 +01:00
Thomas Negre
f2c85786ae add en_US strings 2022-02-23 16:24:32 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
atm-lena
45fe83289f MoChild category 2022-02-22 11:32:33 +01:00
Laurent Destailleur
ff0c4ef635
Merge pull request #19952 from thomas-Ngr/develop_new_ticket_display_statut_warning 
NEW : optional display warning icons on ticket list
 2022-02-22 01:35:33 +01:00
BB2A Anthony Berton
d28ba84cb3 Mail sendto default and add filter 2022-02-21 16:15:40 +01:00
BB2A Anthony Berton
2595f1f9ee sens dump 2022-02-21 15:56:09 +01:00
atm-lena
dd6d0a118a Translation 2022-02-21 15:28:38 +01:00
Thomas Negre
cdbf0bdf6f add translation strings 2022-02-21 12:09:28 +01:00
Thomas Negre
ffbe094635 Add strings for ticket warnings 2022-02-21 11:46:30 +01:00
atm-lena
e5039a67b0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-02-21 10:22:22 +01:00
Laurent Destailleur
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
3e4279f37b
Merge pull request #20083 from ATM-Consulting/FIX_VacantPosition 
FIX : HRM | Vacant position option
 2022-02-18 20:47:54 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
e41e0f069a Fix creator in PDF. Add log to help to find strange bug 2022-02-18 15:09:52 +01:00
Atm-Gregr
30cde100ff trad us 2022-02-18 14:41:29 +01:00
Laurent Destailleur
61e91656e0 FIX setup of member module 
FIX generation of business cards
 2022-02-18 14:14:34 +01:00
Quentin VIAL-GOUTEYRON
879afaa59e NEW : Beginning of PMP management on inventory 2022-02-18 12:16:50 +01:00
Laurent Destailleur
21ebedc755 Fix trans 2022-02-17 20:10:09 +01:00
Laurent Destailleur
6e5c7358de
Merge branch 'develop' into NEW_Needs_net_tab_on_bom 2022-02-17 20:06:38 +01:00
Laurent Destailleur
ec71eb410e
Merge pull request #20040 from thomas-Ngr/develop_ticket_config_auto_read 
ticket config: auto read ticket
 2022-02-17 19:58:01 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Atm-Gregr
8d14d18638 Merge branch '15.0' of github.com:Dolibarr/dolibarr into FIX_VacantPosition 2022-02-17 09:59:36 +01:00
Alexandre SPANGARO
0f51fadf38
Merge branch 'develop' into 16a12_assets_code 2022-02-17 04:15:03 +01:00
Laurent Destailleur
73e2b13418 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-16 20:32:30 +01:00
Laurent Destailleur
2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php
 2022-02-16 20:31:55 +01:00
Atm-Gregr
038298a638 change button and add title 2022-02-16 16:10:48 +01:00
Noé Cendrier
98c50f531c translation string instead of error message text 2022-02-16 15:57:39 +01:00
Atm-Gregr
1a41232181 add vacant position option 2022-02-16 15:24:35 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
atm-lena
398927f2c8 Clean Code 2022-02-15 16:24:39 +01:00
atm-lena
2ba0af0d0b Parent MO List Mo : wip 2022-02-15 14:49:16 +01:00
atm-lena
0f4b1e1d7a WIP 2022-02-15 11:46:30 +01:00
Laurent Destailleur
1b53ed09f9 Work on custom report feature 2022-02-15 11:03:48 +01:00
Laurent Destailleur
54bf8ed1ed Fix link 2022-02-14 22:53:24 +01:00
Laurent Destailleur
b6879d7953 css 2022-02-14 22:38:45 +01:00
Alexandre SPANGARO
99aa8dc2b1 Lang 2022-02-14 05:33:57 +01:00
Alexandre SPANGARO
bb96856206 Lang 2022-02-14 05:16:08 +01:00
Laurent Destailleur
d5e5e8d436 Debug v15 2022-02-13 17:09:40 +01:00
Thomas Negre
39bd5dd6dc ticket config : add TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND option to config panel 2022-02-10 17:50:59 +01:00
Quentin VIAL-GOUTEYRON
cd955930b6 change bt link 2022-02-10 15:00:55 +01:00
Laurent Destailleur
21f0264683 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:02:48 +01:00
Laurent Destailleur
1d6a7ebe03 Fix pb with bulk payment feature 2022-02-10 13:01:47 +01:00
Laurent Destailleur
40f0aa45c8 Merge 2022-02-10 11:15:45 +01:00
Laurent Destailleur
77f1649adf
Merge pull request #20012 from atm-adrien/NEW_rec_invoices_15.0_newPR 
NEW Recurring vendor invoices
 2022-02-10 10:09:47 +01:00
Laurent Destailleur
9a371cb076 Trans 2022-02-10 09:56:01 +01:00
lvessiller
44e9b13f30 NEW barcode rule to insert product in takepos 2022-02-09 16:37:41 +01:00
Quentin VIAL-GOUTEYRON
9e667e0155 NEW Needed nets bom 2022-02-09 15:55:21 +01:00
Adrien Raze
194959c61c FIX : Fixing PR returns 2022-02-09 10:03:30 +01:00
atm-lena
8db75f0d04 WIP 2022-02-08 15:54:31 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +01:00
Laurent Destailleur
21db3c19dd Trans 2022-02-07 14:49:10 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
Laurent Destailleur
31ca78acda Sync transifex. 
Fix install.
 2022-02-07 14:25:20 +01:00
Laurent Destailleur
3e6d922cc0
Merge pull request #19938 from bb2a/border-table-2 
NEW - Border table
 2022-02-06 14:59:31 +01:00
Laurent Destailleur
86da9c610e
Merge pull request #17887 from marc-dll/develop_NEW_block_leave_if_negative_balance 
NEW: leave requests: add field into type dictionary to block request if balance is negative
 2022-02-04 20:23:04 +01:00
Laurent Destailleur
c9a685e09d Better error message 2022-02-04 19:21:47 +01:00
Laurent Destailleur
aef646bb2a Change order of options and removed useless option 2022-02-04 12:17:38 +01:00
Laurent Destailleur
3db0a98594 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-02 18:26:15 +01:00
Laurent Destailleur
0259f094bd Fix trans 2022-02-02 18:04:11 +01:00
Laurent Destailleur
2fea78c90a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2022-01-29 16:48:40 +01:00
Laurent Destailleur
266fc808af Fix trans 2022-01-29 00:15:55 +01:00
Laurent Destailleur
a113231e7b
Merge pull request #19961 from chiariello/develop 
NEW #17123 added ExtraFields for Stock Mouvement
 2022-01-28 18:04:22 +01:00
Francis Appels
8d75f575e5 Fix missing reception module description translation key. 2022-01-28 16:35:14 +01:00
Laurent Destailleur
a631c94193 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-28 15:58:15 +01:00
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +01:00
Salvatore Chiariello
e70604c485 NEW|New #17123 added ExtraFields for Stock Mouvement 2022-01-28 14:57:36 +01:00
Laurent Destailleur
5ff37febe3 Trans 2022-01-28 09:58:58 +01:00
BB2A Anthony Berton
be543b3ef9 ok 2022-01-26 17:25:13 +01:00
BB2A Anthony Berton
28b9ead688 ADD config text color 2022-01-26 15:06:51 +01:00
BB2A Anthony Berton
656dc02e7d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2022-01-26 13:03:01 +01:00
Laurent Destailleur
2dda4f5924 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-01-26 11:29:50 +01:00
Laurent Destailleur
3e1cfc2997 NEW Add status "Obsolete" to KM articles 2022-01-26 11:29:27 +01:00
BB2A Anthony Berton
54b5fed67b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2022-01-25 16:45:30 +01:00
Laurent Destailleur
243999d223
Merge pull request #19746 from atm-quentin/NEW_contact_pj_filter_list 
NEW : Contact filter project list
 2022-01-25 16:06:31 +01:00
Laurent Destailleur
f773872dd1
Merge branch 'develop' into NEW_contact_project_tab 2022-01-25 15:58:54 +01:00
Laurent Destailleur
13f66df975 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:57 +01:00
Laurent Destailleur
c3a58ae303 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:42 +01:00
Laurent Destailleur
5d176c75db
Merge pull request #19780 from aspangaro/16a7 
NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice
 2022-01-25 15:00:47 +01:00
Laurent Destailleur
bb11ab992b Trans 2022-01-24 17:50:35 +01:00
Laurent Destailleur
8ceec043e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:10 +01:00
Laurent Destailleur
307338e3f4
Merge pull request #19836 from atm-john/15.0_fix_validate_lang_and_test 
FIX :  lang load in validate class and fix test for numeric values
 2022-01-23 18:24:11 +01:00
Laurent Destailleur
9049134556 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-23 12:07:11 +01:00
Laurent Destailleur
e06ca2ea08 css 2022-01-23 02:38:34 +01:00
Laurent Destailleur
a16293f9b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-22 17:27:57 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +01:00
Laurent Destailleur
d38784f45a WIP Login with Google 2022-01-19 20:33:20 +01:00
Laurent Destailleur
f2760cded6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-18 19:22:43 +01:00
Laurent Destailleur
b3a8b56625 Fix typo 2022-01-18 19:01:51 +01:00
Laurent Destailleur
2462700975 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-17 13:57:59 +01:00
Laurent Destailleur
7034ddf063 Freemono instead of freeserif 2022-01-17 13:56:32 +01:00
Laurent Destailleur
5fd2d00936 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-17 08:57:48 +01:00
Laurent Destailleur
cdbcad9c4f Sync transifex 2022-01-16 12:51:08 +01:00
Laurent Destailleur
ecde594a15 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/card.php
 2022-01-14 20:28:44 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
f04a07b6a7 FIX Pb with permission on holiday and expense report 2022-01-14 13:42:38 +01:00
ATM john
8ace96f495 Fix validate class lang load and test for numeric values 2022-01-14 11:46:31 +01:00
Laurent Destailleur
1ae01ba2fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-14 10:38:38 +01:00
Laurent Destailleur
62ae0361f7
Merge pull request #19818 from DATUC/patch-24 
Update companies.lang
 2022-01-14 10:19:48 +01:00
Laurent Destailleur
71e470eb6c
Merge pull request #19826 from atm-gauthier/FIX_hrm 
FIX : several adaptations rank => rankorder and langs correction for HRM
 2022-01-14 10:01:14 +01:00
Laurent Destailleur
b7aa152464 Fix trans 2022-01-14 09:55:13 +01:00
Gauthier PC portable 024
a77a2e9bcc FIX : several adaptations rank => rankorder and langs correction for HRM 2022-01-13 11:39:54 +01:00
DATUC
800de88c69
Update companies.lang 2022-01-12 12:26:06 +01:00
Laurent Destailleur
c024585ec9 Trans 2022-01-12 11:13:14 +01:00
Laurent Destailleur
5c4f521025
Merge pull request #19807 from DATUC/patch-14 
Update companies.lang
 2022-01-12 11:10:48 +01:00
Laurent Destailleur
8948d15930
Merge pull request #19798 from DATUC/patch-5 
Update companies.lang
 2022-01-12 11:10:31 +01:00
DATUC
e2306f5915
Update companies.lang 2022-01-12 00:41:05 +01:00
DATUC
89e509b251
Update companies.lang 2022-01-12 00:30:11 +01:00
DATUC
3384632005
Update companies.lang 2022-01-12 00:28:26 +01:00
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Alexandre SPANGARO
960aaded8e NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice 2022-01-09 21:08:06 +01:00
Florian HENRY
61fc81732c fix: #19749 2022-01-07 11:29:43 +01:00
Laurent Destailleur
26e8496c46 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
 2022-01-06 16:15:58 +01:00
Laurent Destailleur
2d0f4cab51
Merge pull request #19705 from atm-maxime/fix_supplier_credit_transfer 
Fix supplier credit transfer
 2022-01-06 16:10:53 +01:00
Laurent Destailleur
b4ff7826db Trans 2022-01-06 16:08:21 +01:00
Laurent Destailleur
1e467c60f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/facture/list.php
	htdocs/product/stock/movement_list.php
 2022-01-06 11:15:28 +01:00
Laurent Destailleur
61cbf52a94 Fix tooltip email collector 2022-01-05 21:27:00 +01:00
Laurent Destailleur
1471c2422d Fix trans 2022-01-05 20:49:38 +01:00
Quentin VIAL-GOUTEYRON
7a4b0e38cd NEW : Contact filter project list 2022-01-05 14:35:11 +01:00
Alexandre SPANGARO
b719042b09 Missing language key on error 2022-01-04 10:47:59 +01:00
Quentin VIAL-GOUTEYRON
b1f750ac2f NEW: Project contact tab 2022-01-04 10:35:44 +01:00
Laurent Destailleur
a887e41600 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/compta/bank/info.php
	htdocs/compta/bank/line.php
	htdocs/compta/bank/releve.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/fourn/class/fournisseur.product.class.php
 2022-01-04 09:45:31 +01:00
Laurent Destailleur
807f2841d4 FIX Navigation on bank transaction list 2022-01-04 09:33:52 +01:00
Laurent Destailleur
6654b138b9 Fix trans 2022-01-03 22:11:04 +01:00
Laurent Destailleur
f8a97ef928 FIX a lot of problem with rules for password validation 2022-01-03 16:09:08 +01:00
Laurent Destailleur
f7871be6cd Debug v15 2022-01-03 03:06:18 +01:00
Laurent Destailleur
48c990a8bf Sync transifex 2022-01-02 18:22:18 +01:00
Laurent Destailleur
adec35d4b1 Debug v15 2022-01-02 15:46:28 +01:00
Anthony Berton
78861c1743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2021-12-29 19:21:03 +01:00
Maxime Kohlhaas
1e848f0ebb Fix prelevement right management and action buttons 2021-12-28 18:17:57 +01:00
Maxime Kohlhaas
93393b82a3 Fix nav + translations on supplier invoice credit transfer 2021-12-28 17:40:25 +01:00
Laurent Destailleur
a7ef4991fd Fix position of menu 2021-12-26 15:41:09 +01:00
Laurent Destailleur
4eb9a7625a Fix notification setup page. 2021-12-23 15:12:35 +01:00
lmarcouiller
8e11b1c996 import with select boxes 2021-12-23 11:25:57 +01:00
lmarcouiller
733e411a67 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-12-23 11:14:47 +01:00
Laurent Destailleur
dd94745e33 Fix css for rtl languages 2021-12-22 20:57:14 +01:00
Laurent Destailleur
de25cf3a72 NEW: Hidden option API_DISABLE_COMPRESSION is now visible in API setup 
page.
 2021-12-21 14:08:06 +01:00
Laurent Destailleur
12645926cc Fix text 2021-12-21 12:12:32 +01:00
lmarcouiller
11eac8eee9 Merge branch 'develop#1' of github.com:Hystepik/dolibarr into develop#1 2021-12-20 14:41:08 +01:00
Laurent Destailleur
0465afbc34 Fix css for takepos 2021-12-20 13:39:34 +01:00
Laurent Destailleur
ee3246bf65 Trans 2021-12-19 16:02:28 +01:00
Laurent Destailleur
19afcbbc40 css 2021-12-19 15:59:34 +01:00
Laurent Destailleur
771805cd83 More complete error management. 2021-12-19 03:36:25 +01:00
Laurent Destailleur
a662a980db Trans 2021-12-19 01:41:09 +01:00
Laurent Destailleur
bf441dda14 Fix report of expense-income must be without tax in debt 2021-12-18 18:11:28 +01:00
Laurent Destailleur
7266c78162 Clean/Debug code for v15 2021-12-17 17:40:30 +01:00
Laurent Destailleur
654cd8bd1c Fix for dol_string_onlythesehtmlattributes() 2021-12-17 12:01:25 +01:00
Laurent Destailleur
494e9a2745
Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-12-16 19:12:06 +01:00
Laurent Destailleur
81f4a1d80c
Merge pull request #19620 from frederic34/patch-1 
check for mbstring extension at install
 2021-12-16 17:16:28 +01:00
Laurent Destailleur
d92535ec59 FIX Debug transfert in accountancy for expense report 2021-12-16 15:41:23 +01:00
Laurent Destailleur
9465edd8ec Add warning making payment if pending direct debit or credit trans 2021-12-16 14:09:56 +01:00
Laurent Destailleur
f589121199 Trans 2021-12-16 01:17:22 +01:00
Frédéric FRANCE
a02cb4c9b1
Update install.lang 2021-12-14 22:52:39 +01:00
Anthony Berton
9bc2a561bc ok 2021-12-14 10:52:16 +01:00
Laurent Destailleur
582caf0e7a FIX message for automatic binding not clear of what was done or not 2021-12-13 19:04:25 +01:00
Laurent Destailleur
e7b7c3281e Fix page of accountancy transaction 2021-12-13 17:42:10 +01:00
Laurent Destailleur
4d1e247a5c Trans 2021-12-10 12:51:00 +01:00
Laurent Destailleur
9fbe0dee9b Fix trans 2021-12-10 12:36:51 +01:00
Laurent Destailleur
ecf98530bb Debug SEPA payment module 2021-12-09 12:42:04 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
 2021-12-08 17:56:05 +01:00
lmarcouiller
c6c7abbf1d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-12-07 10:48:17 +01:00
Laurent Destailleur
259b7dfe5a NEW: Add massaction to switch status on sale / on purchase of a product. 2021-12-06 02:48:34 +01:00
Laurent Destailleur
d62b3cafe4 Trans 2021-12-05 19:38:21 +01:00
Laurent Destailleur
9bad92f395 Trans 2021-12-05 19:25:15 +01:00
lmarcouiller
325ad45bca update scan inventory error gestion 2021-12-03 16:04:23 +01:00
Laurent Destailleur
212001ffa7 Trans 2021-12-03 15:15:08 +01:00
Laurent Destailleur
53ab2dd109 Trans 2021-12-03 15:13:20 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Laurent Destailleur
3de3adad74 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/ajax/objectonoff.php
 2021-11-30 16:11:12 +01:00
Laurent Destailleur
87a66c7bf0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-30 15:57:14 +01:00
Laurent Destailleur
f66f9082e7
Merge pull request #19509 from fr69400/patch3 
FIX Html conversion check with PDF_BOLD_PRODUCT_LABEL
 2021-11-30 14:04:10 +01:00
Laurent Destailleur
a7f9ffd5d0
Merge pull request #19461 from frederic34/lastactivationversion 
keep info on latest activation version of module
 2021-11-30 12:16:39 +01:00
Laurent Destailleur
cf165835bf
Merge pull request #19462 from KlaasOl/patch-5 
Update main.lang
 2021-11-30 12:00:35 +01:00
lmarcouiller
0d65fdad23 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-11-29 10:38:11 +01:00
Laurent Destailleur
e3e4b154e7 Fix partnership 2021-11-29 01:04:32 +01:00
Frédéric FRANCE
308998e21c
Merge remote-tracking branch 'upstream/develop' into productmerge 2021-11-28 21:14:12 +01:00
fr69400
5a165ae2bf FIX PDF_NOLD_PRODUCT_LABEL 2021-11-28 14:40:15 +01:00
Klaas Oldenburger
2030d55c67
Update main.lang 
Did not complete earlier work.
 2021-11-27 16:42:53 +01:00
Laurent Destailleur
7b68ef1fb8 Clean/Debug module hrm. 2021-11-27 14:46:47 +01:00
Laurent Destailleur
734c9871ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-11-27 01:07:32 +01:00
Marc de Lima Lucio
1361abffe5 FIX: holiday list: only mass delete if leave request is not in draft, canceled or refused, like in card 2021-11-26 18:22:31 +01:00
Laurent Destailleur
bf1dfac629 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
	htdocs/product/stock/movement_list.php
 2021-11-25 21:54:06 +01:00
Laurent Destailleur
78f94b1c76 Fix css and label for recurring invoices 2021-11-25 14:17:20 +01:00
Laurent Destailleur
0c54723185 css 2021-11-25 10:28:37 +01:00
Laurent Destailleur
01038b190d Better error report on id command that failed 2021-11-24 22:35:10 +01:00
Gauthier PC portable 024
641002ae96 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-11-24 09:05:24 +01:00
Klaas Oldenburger
0b871ea0fb
Update main.lang 
Changing date format the Dutch way
 2021-11-24 08:06:56 +01:00
Frédéric FRANCE
e6af0facdd
keep info on latest activation version of module 2021-11-23 23:27:07 +01:00
Frédéric FRANCE
d9bcd27764
can merge products but experimental 2021-11-23 21:55:48 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental 2021-11-23 21:38:29 +01:00
Laurent Destailleur
ee14aa2597 Fix: Do not loose data on error when editing a line 2021-11-23 12:11:27 +01:00
Giovanni Vella
f7abf59a07
Merge branch 'Dolibarr:develop' into develop 2021-11-23 08:48:52 +01:00
Gauthier PC portable 024
e02405edc9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:23:26 +01:00
Gauthier PC portable 024
9840c1e0fa Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:17:55 +01:00