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

11314 Commits

Author SHA1 Message Date
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
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
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
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