Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
52,242 Commits 36 Branches 189 Tags
2c31b9bcf5fdc0e891370ec23a0d048342aaf93c
Commit Graph

52242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2c31b9bcf5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-22 12:42:01 +01:00
Laurent Destailleur
fe06ad39c0 NEW Add a tool for developers to purge database with no loose of setup 2016-02-22 12:41:49 +01:00
Laurent Destailleur
a118d58e5e Merge pull request #4638 from GPCsolutions/dolibarr-clone 
[Qual] Replaced deprecated dol_clone calls
 2016-02-21 19:22:47 +01:00
Laurent Destailleur
0dc76fa1cd Merge pull request #4626 from IonAgorria/hide-hourmins-2 
Form changes to add duration info
 2016-02-21 19:22:13 +01:00
Laurent Destailleur
64b373f0ff Merge pull request #4658 from abcnet-lu/lux-facture-mentions-obligatoires 
FIX: Luxembourg correct professional ID "RCS" to display on invoices
 2016-02-21 19:16:14 +01:00
Laurent Destailleur
77fcdc2e1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-21 19:15:40 +01:00
Laurent Destailleur
3c2b50c6a2 Include PR 2016-02-21 19:14:18 +01:00
Laurent Destailleur
fb0e74645e Merge pull request #4663 from peckpeck/xlsx_support 
NEW Allow imports from xlsx files
 2016-02-21 19:12:38 +01:00
Laurent Destailleur
00841ea3fd Merge pull request #4661 from IonAgorria/dynamic-prices-fixes 
Dynamic prices fixes
 2016-02-21 19:08:41 +01:00
Benoît Peccatte
5a8d1f1c95 Allow imports from xlsx files 2016-02-21 14:10:19 +01:00
Ion Agorria
9fc7041a28 Use error_parser instead of reserved error var 2016-02-20 19:47:17 +01:00
Ion Agorria
c84e74c081 Fix dynamic price parsing in fournisseurs.php 2016-02-20 19:37:11 +01:00
Laurent Destailleur
351ce6228d NEW Add width and height on product card 2016-02-20 04:49:02 +01:00
Laurent Destailleur
d3960b0809 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/member.lib.php
	htdocs/expedition/card.php
 2016-02-20 04:25:39 +01:00
Laurent Destailleur
7def330f54 Fix missing error message and input lost in shipment create page 2016-02-20 03:58:52 +01:00
Laurent Destailleur
2e27319d1b Fix Removed not expected br 2016-02-20 03:42:29 +01:00
Laurent Destailleur
a2817049c9 Fix must show warning only if threshold defined. 2016-02-20 03:34:56 +01:00
Laurent Destailleur
277d92af75 Secure migration for people using a RC 2016-02-20 03:14:29 +01:00
Laurent Destailleur
0ec6c20ebb Translation 2016-02-20 02:55:32 +01:00
Laurent Destailleur
f15e06f623 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-20 02:45:43 +01:00
Laurent Destailleur
fcc26f36ba Fix default first line to import is 1 2016-02-20 02:45:31 +01:00
Ion Agorria
fc8f1272d2 Fix line fetch not converting dates 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2016-02-20 02:34:01 +01:00
Laurent Destailleur
7ff8c2c3db FIX Missing carriage return when phone is into property ->phone 2016-02-20 02:31:42 +01:00
Laurent Destailleur
0a02d58afb Merge pull request #4656 from defrance/patch-104 
Add model_pdf fields for edition feature on product
 2016-02-20 02:29:58 +01:00
Laurent Destailleur
12e6b52131 Merge pull request #4654 from aspangaro/3.9-p12 
Fixed: Members - Problem of tab & missing language file
 2016-02-20 02:28:48 +01:00
Laurent Destailleur
e0f7e3dece Merge pull request #4659 from IonAgorria/fix-propal-fetch-date 
Fix line fetch not converting dates
 2016-02-20 02:26:30 +01:00
Laurent Destailleur
f762196c77 NEW Can define number of first and last line into import wizard. 2016-02-20 02:21:24 +01:00
Laurent Destailleur
266fb14a2c FIX Missing carriage return when phone is into property ->phone 2016-02-20 02:19:18 +01:00
Laurent Destailleur
7765e37101 Better support of option SOCIETE_SORT_ON_TYPEENT 2016-02-19 21:09:36 +01:00
Laurent Destailleur
4754ba5683 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/install/mysql/data/llx_10_c_regions.sql
	htdocs/install/mysql/data/llx_20_c_departements.sql
	htdocs/install/mysql/data/llx_c_forme_juridique.sql
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/companies.lang
	htdocs/langs/fr_FR/compta.lang
 2016-02-19 20:17:51 +01:00
Ion Agorria
6002897976 Fix line fetch not converting dates 2016-02-19 20:06:09 +01:00
Laurent Destailleur
82f57b2ccf Better position for modules 2016-02-19 20:05:25 +01:00
Laurent Destailleur
0faebc25ba Update translations 2016-02-19 19:33:31 +01:00
Laurent Destailleur
da284cda8c Add category Supplier Relationship Manager 2016-02-19 19:20:21 +01:00
Laurent Destailleur
00657d3bbe Fix sql forging error 2016-02-19 19:11:54 +01:00
Laurent Destailleur
dbb8460180 Fix avoid false warning 2016-02-19 19:11:31 +01:00
Laurent Destailleur
c07bb2dd5c Add translation file for website module 2016-02-19 18:51:31 +01:00
abcnet-lu
2177235e29 [Close] [#4657] BUG: Luxembourg correct professional ID "RCS" to display on invoices 2016-02-19 17:01:51 +01:00
Laurent Destailleur
f8956f785d Fix syntax error 2016-02-19 16:12:39 +01:00
Laurent Destailleur
6ab8ba1cb1 Fix sql error 2016-02-19 16:10:14 +01:00
BENKE Charlie
d96c89afa1 Update 3.9.0-4.0.0.sql 2016-02-19 15:55:59 +01:00
BENKE Charlie
8f866254ac add model_pdf fields for edition feature 2016-02-19 15:47:37 +01:00
Laurent Destailleur
994715f8bb Upgrade romania 2016-02-19 15:47:00 +01:00
Laurent Destailleur
e820f09912 Start to introduce native responsive design 2016-02-19 15:28:43 +01:00
Laurent Destailleur
1cd0efd8db Fix picto 2016-02-19 14:18:50 +01:00
aspangaro
d77a8bddcf Fixed: Members - Problem of tab & missing language file 2016-02-19 07:39:14 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
cc524c8180 Fix bad picto 2016-02-19 04:41:29 +01:00
Laurent Destailleur
79bc7cf085 Fix showing description 2016-02-19 04:05:08 +01:00
Laurent Destailleur
3864bd35c9 Fix NPR Vat is working correctly with multiprice too 2016-02-19 03:59:43 +01:00