2
0
forked from Wavyzz/dolibarr
Commit Graph

5117 Commits

Author SHA1 Message Date
Laurent Destailleur
5d7a1f1265 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/en_US/stocks.lang
2019-11-19 19:02:14 +01:00
Laurent Destailleur
74c85b742e Fix ref must be null until the generation of ref is ok 2019-11-18 18:09:12 +01:00
Laurent Destailleur
ae0fdf014f Debug email collector. Missing unique key. Fix initial setup. 2019-11-18 11:55:22 +01:00
Laurent Destailleur
502626156e Work on MRP module 2019-11-17 01:23:19 +01:00
Laurent Destailleur
7a4647b3fb Merge pull request #12458 from frederic34/doxygen_accountancy
doxygen accountancy class
2019-11-16 23:31:56 +01:00
Laurent Destailleur
6dcd1f6275 Fix css 2019-11-16 13:50:12 +01:00
Frédéric FRANCE
5c0976a778 doxygen accountancy class 2019-11-16 09:58:14 +01:00
Laurent Destailleur
8ef9728470 Fix permission on file 2019-11-14 17:28:23 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Laurent Destailleur
88d2658625 Merge branch 'develop' into scrutinizer-patch-2 2019-11-13 19:14:50 +01:00
Laurent Destailleur
43ac3dc9e8 Merge pull request #12416 from frederic34/patch-6
Update llx_c_action_trigger.sql
2019-11-13 18:41:24 +01:00
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:32:11 +00:00
Laurent Destailleur
56c2dc2614 Reduce need of translations 2019-11-12 22:29:36 +01:00
Frédéric FRANCE
4f90fe0fd2 Update 10.0.0-11.0.0.sql 2019-11-12 21:34:45 +01:00
Frédéric FRANCE
422d893ecc Update llx_c_action_trigger.sql 2019-11-12 21:33:42 +01:00
Laurent Destailleur
1153b81e6f Update templates 2019-11-12 16:08:03 +01:00
Laurent Destailleur
2c718af26c Missing container type 'menu'
Fix: Add security if container is not a page
2019-11-12 13:55:46 +01:00
Laurent Destailleur
3054177e79 Fix type of tickets 2019-11-10 12:28:30 +01:00
Laurent Destailleur
880ecda098 Fix name of tables 2019-11-10 12:23:21 +01:00
Laurent Destailleur
eb378b45a4 Work on BOM - MO module 2019-11-09 20:35:45 +01:00
Laurent Destailleur
59d83fce59 Debug MRP module 2019-11-09 19:57:38 +01:00
Laurent Destailleur
a901ce932d Repair 2019-11-07 14:19:52 +01:00
Laurent Destailleur
56c20b1d2b Merge pull request #12350 from frederic34/patch-14
missing table product_fournisseur_price_extrafields
2019-11-07 11:30:51 +01:00
Laurent Destailleur
1ea8fed9c4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:16:20 +01:00
Laurent Destailleur
feef992d39 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:16:09 +01:00
Laurent Destailleur
887c1a70d9 Fix remove annoying files 2019-11-06 18:46:04 +01:00
Frédéric FRANCE
f292b1f244 missing table product_fournisseur_price_extrafields
@Tim-Otte
2019-11-05 22:25:30 +01:00
Frédéric FRANCE
bbf962842e add icons 2019-11-05 21:09:11 +01:00
Laurent Destailleur
7c4942b7be Fix debug BOM/MO 2019-11-05 20:14:33 +01:00
Laurent Destailleur
1042cbd989 Fix duplicate ... 2019-11-05 17:20:44 +01:00
Laurent Destailleur
1b701f162a FIX #12307 2019-11-05 13:16:39 +01:00
Laurent Destailleur
b4d72e3e96 Fix link to setup of social network module 2019-11-05 10:00:46 +01:00
Frédéric FRANCE
7ecdfa7c96 oups 2019-11-03 22:51:42 +01:00
Frédéric FRANCE
872f58f261 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Laurent Destailleur
ec9ce1721b Last recent versions of migration at top 2019-11-02 17:18:34 +01:00
Laurent Destailleur
c63db01d5f Merge branch 'develop' into patch-234 2019-11-02 16:20:24 +01:00
Laurent Destailleur
496f93911f Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
935a7cffa1 Merge pull request #12236 from wdammak/patch-43
Remove limit time for upgrade
2019-11-02 13:45:39 +01:00
Laurent Destailleur
a971943832 Update upgrade2.php 2019-11-02 13:45:27 +01:00
stickler-ci
01d8c3bffd Fixing style errors. 2019-11-02 12:20:32 +00:00
wdammak
378d0b0781 Update upgrade2.php 2019-11-02 13:18:48 +01:00
Laurent Destailleur
906f30773d Merge pull request #12269 from atm-ph/new_edit_comment
New update comments is now available
2019-11-02 13:09:21 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
68c971a2b5 All properties 'type_libelle' were renamed into 'type_label'. 2019-11-02 11:12:57 +01:00
Laurent Destailleur
036c1410c7 NEW Save user of last modification in donation record 2019-10-31 23:17:08 +01:00
Laurent Destailleur
716c2bb531 Work on MO 2019-10-31 22:46:34 +01:00
Laurent Destailleur
b296f62671 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-10-31 02:36:31 +01:00
Laurent Destailleur
645390c990 Work on BOM templates 2019-10-31 02:36:16 +01:00
Frédéric FRANCE
f7747ed00a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
atm-ph
2f68a73a2a New update comments is now available 2019-10-30 15:45:04 +01:00