Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
61,071 Commits 36 Branches 189 Tags
8f34de1036680906ebdb8c05e6460077b5dc4b43
Commit Graph

7537 Commits

Author SHA1 Message Date
Laurent Destailleur
c722286bcb Fix regressions 2017-04-28 13:37:36 +02:00
Laurent Destailleur
0ba6433a61 Work on module website 2017-04-28 13:10:08 +02:00
Laurent Destailleur
853c8a8e07 Fix typo 2017-04-27 18:05:53 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
5e856e6923 More complete tooltip help to describe available substitution vars 2017-04-27 17:16:19 +02:00
Laurent Destailleur
1758b83604 Clean explanation for accounting module setup. 2017-04-27 13:50:13 +02:00
Laurent Destailleur
9c2ce0202d Translation 2017-04-27 13:19:36 +02:00
Laurent Destailleur
1a98c4a3ff Fix error management in adding translation key 2017-04-27 12:48:13 +02:00
Laurent Destailleur
508109d5b1 Translation 2017-04-27 00:21:00 +02:00
Laurent Destailleur
84e774ff32 Better translation 2017-04-25 12:57:20 +02:00
Alexandre SPANGARO
c3fe1c963a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-22 06:33:31 +02:00
florian HENRY
10541e0c53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_importexport_ressources 2017-04-19 14:48:06 +02:00
Laurent Destailleur
50210d0dd6 NEW Add tooltip help on shipment weight and volume calculation 2017-04-18 17:04:56 +02:00
fappels
433b9e6fe1 Fix typo in en_US admin tag 2017-04-18 16:22:39 +02:00
florian HENRY
a52db08cd6 NEW : Add module resources import/export 2017-04-18 15:25:04 +02:00
Laurent Destailleur
9456f7091e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-04-18 01:36:33 +02:00
Laurent Destailleur
82f9555c6b Translation 2017-04-18 01:35:58 +02:00
Laurent Destailleur
0994622bf8 NEW Can use translations into all substitutions (watermark, freetext...) 2017-04-17 23:54:09 +02:00
Alexandre SPANGARO
fed6d71d8a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-17 06:51:02 +02:00
Laurent Destailleur
e97e202deb NEW Can import users 2017-04-17 04:22:53 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
b0442aa56a Better explanation on label that are translated. 2017-04-14 19:48:01 +02:00
Laurent Destailleur
e6e9b65594 NEW Reduce memory usage by removing deprecated constant loading. 2017-04-14 12:38:52 +02:00
Laurent Destailleur
db23a5222b Fix translation 2017-04-13 15:12:19 +02:00
Laurent Destailleur
3e9ccc186a NEW Small PDF template for products 2017-04-13 10:26:12 +02:00
Laurent Destailleur
a6b05bb4da Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0 2017-04-12 14:08:58 +02:00
Laurent Destailleur
0417eb3862 Merge pull request #6686 from guillaume-uH57J9/develop 
NEW Improve public member subscription form with member type
 2017-04-11 11:31:25 +02:00
Laurent Destailleur
759315aef5 NEW Mass action delete available on project and tasks 2017-04-11 02:48:16 +02:00
Laurent Destailleur
d15792bdf4 Minor fix 2017-04-11 00:59:47 +02:00
Laurent Destailleur
06f9c1989b Work on default values 2017-04-10 13:14:31 +02:00
Laurent Destailleur
f1ae0eb7c6 Default value 2017-04-10 12:51:52 +02:00
Guillaume
f427c8441a add translation strings for ForceMemberType 2017-04-09 22:49:48 +02:00
Laurent Destailleur
ddd101757e FIX Bulk pdf merge on supplier proposals 2017-04-09 13:26:26 +02:00
Laurent Destailleur
76af83ce06 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-08 14:06:25 +02:00
Laurent Destailleur
7f7ba6279a Fix translation 2017-04-08 14:02:07 +02:00
Laurent Destailleur
aa47575b13 Serious debug of variant module. No more fu.. js errors on smarpthone. 2017-04-07 12:31:08 +02:00
Laurent Destailleur
ea44e14b60 Start debug the variant module 2017-04-07 11:01:12 +02:00
Laurent Destailleur
f598bf8bef Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-04-06 21:59:11 +02:00
Laurent Destailleur
8363bee234 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/filefunc.inc.php
 2017-04-06 21:56:48 +02:00
Laurent Destailleur
fe4f71296f FIX #6636 Complete fix 2017-04-06 21:55:23 +02:00
Laurent Destailleur
e2b96abd0b Fix translation 2017-04-05 13:34:52 +02:00
Laurent Destailleur
9df4bac202 NEW Bookmarks are into a combo list. 2017-04-04 11:56:19 +02:00
Laurent Destailleur
4902df7e3f Work on look and feel v6 2017-04-02 19:28:38 +02:00
Laurent Destailleur
cab944a1a1 Merge pull request #6602 from aspangaro/6.0-multijournal 
New : [FP17] Accounting multi-journals
 2017-03-31 17:45:10 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00
Laurent Destailleur
18e1e5b780 NEW Add "depends on" and "required by "into module informations 2017-03-30 15:54:48 +02:00
Laurent Destailleur
8e70c4a0b7 Work on 6.0 new look and feel 2017-03-30 15:39:50 +02:00
Laurent Destailleur
aca1c1944d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2017-03-30 12:02:27 +02:00
Laurent Destailleur
ce7368d10e Fix events create from member card not linked to member 2017-03-30 11:51:07 +02:00