2
0
forked from Wavyzz/dolibarr
Commit Graph

8653 Commits

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