Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

9872 Commits

Author SHA1 Message Date
Frédéric FRANCE
4c4ae5b6e1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
Alexandre SPANGARO
60f19d134c Fix Ticket - Align language type with datas for translation 2019-11-26 03:58:01 +01:00
Laurent Destailleur
a8c2aa094d More examples 2019-11-25 20:30:05 +01:00
Laurent Destailleur
61f414488a Fix translation 2019-11-24 18:34:07 +01:00
Cédric
950a32a433 Checkbox label delete child product FR 2019-11-23 18:11:20 +01:00
Cédric
b959e59554 Checkbox label delete child product EN 2019-11-23 18:09:17 +01:00
atm-greg
ce15af0980 manage packaging on supplier prices 2019-11-23 15:52:34 +01:00
Laurent Destailleur
32f590f274 Merge pull request #12485 from aspangaro/12.0_a2 
NEW Add shipment widget
 2019-11-22 14:39:56 +01:00
Laurent Destailleur
383f095063 Fix trans 2019-11-22 09:45:14 +01:00
Alexandre SPANGARO
2f064567ef NEW Add shipment widget 2019-11-21 07:50:44 +01:00
Frédéric FRANCE
d182eee4bf Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-19 23:26:00 +01:00
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
Frédéric FRANCE
2e5f539b2a Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Alexandre SPANGARO
79ee2b8c4d Missing language key 2019-11-18 11:48:44 +01:00
Laurent Destailleur
662c622432 Debug MRP 2019-11-17 00:37:08 +01:00
Frédéric FRANCE
6784ea9fae Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Laurent Destailleur
4fc7b8c3b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
 2019-11-14 12:49:42 +01:00
Laurent Destailleur
a29adc94f3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/card.php
	htdocs/langs/en_US/admin.lang
 2019-11-14 12:48:33 +01:00
Laurent Destailleur
52787b56b2 Fix when limit = 0 
Look and feel v11
 2019-11-14 11:00:49 +01:00
Frédéric FRANCE
05ab4f79ef categories for actioncomm 2019-11-13 18:44:11 +01:00
Alexandre SPANGARO
85e2546019 Missing language key 2019-11-13 15:25:23 +01:00
Alexandre SPANGARO
0497c399d7 Missing language key 2019-11-13 14:59:07 +01:00
Laurent Destailleur
4340f85e3c Add warning 2019-11-13 01:22:13 +01:00
Laurent Destailleur
56c2dc2614 Reduce need of translations 2019-11-12 22:29:36 +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
6afc84fe72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-12 10:20:55 +01:00
Laurent Destailleur
944a15d06b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-12 10:20:16 +01:00
Laurent Destailleur
f8e8d15606 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-12 10:19:01 +01:00
Laurent Destailleur
79cc3f189d Work on BOM 2019-11-11 20:56:28 +01:00
Laurent Destailleur
40d66489ad Trans 2019-11-11 13:47:17 +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
ad2ff551fa Fix trans 2019-11-08 10:35:34 +01:00
Laurent Destailleur
d1c49c7021 Fix trans 2019-11-08 10:24:03 +01:00
Laurent Destailleur
9607f61df5 Merge pull request #12349 from frederic34/patch-13 
Update agenda.lang
 2019-11-07 11:29:59 +01:00
Laurent Destailleur
883fcd7a72 Update agenda.lang 2019-11-07 11:29:45 +01:00
Laurent Destailleur
7144740dfe Merge pull request #12360 from grandoc/new_branch_06_11_2019 
fix error message
 2019-11-07 11:24:15 +01:00
Laurent Destailleur
74f2983ee1 Debug modulebuilder 2019-11-06 19:38:51 +01:00
Philippe GRAND
1b7fe9a427 fix error message 2019-11-06 10:40:21 +01:00
Frédéric FRANCE
df77370a63 Update agenda.lang 2019-11-05 22:01:06 +01:00
Frédéric FRANCE
7d24610d4c Update agenda.lang 2019-11-05 21:57:11 +01:00
Laurent Destailleur
0ef249ea52 Debug module BOM 2019-11-05 18:06:33 +01:00
Laurent Destailleur
1aef1c60dd Merge pull request #11867 from frederic34/socialnetworks 
NEW add socialnetworks dictionary
 2019-11-04 21:10:22 +01:00
Laurent Destailleur
17ea978cea Merge pull request #12306 from frederic34/escpos 
Escpos
 2019-11-04 20:40:12 +01:00
Laurent Destailleur
dbb90914bc Better Trans 2019-11-04 19:53:27 +01:00
Frédéric FRANCE
6ad983bb7b Merge remote-tracking branch 'upstream/develop' into escpos 2019-11-04 18:52:29 +01:00
Laurent Destailleur
a0db0fccbe Debug BOM 2019-11-04 15:56:45 +01:00
Laurent Destailleur
8aa2fd04ad NEW The integrity checker now show the expected size of files 2019-11-04 13:23:48 +01:00
Frédéric FRANCE
872f58f261 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Frédéric FRANCE
d797ea590e rework an experimental module 2019-11-03 00:50:58 +01:00