lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,103 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-2
Commit Graph

11122 Commits

Author SHA1 Message Date
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
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
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
lainwir3d
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
lmarcouiller
1cef6d31e8 Close #18302 : Mass action leave requests 2021-08-02 15:45:55 +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
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
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
lmarcouiller
dd9eb28230 Barcode scanner tool update 2021-07-20 14:43:36 +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
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