lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,539 Commits 43 Branches 150 Tags 886 MiB
854b9df96d
Commit Graph

36539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
Laurent Destailleur
203d4e3ca8 Prepare database for parameters into boxes 2013-04-23 14:17:04 +02:00
Laurent Destailleur
7dce8d2306 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2013-04-23 14:04:56 +02:00
Laurent Destailleur
365a5e18e8 Prepare 3.3.2 2013-04-23 13:56:59 +02:00
Laurent Destailleur
57ab4fb798 Fix doc 2013-04-23 13:38:00 +02:00
Laurent Destailleur
624a039eaf Update debian doc 2013-04-23 12:58:58 +02:00
Laurent Destailleur
8f502b8cfc Prepare 3.3.2 2013-04-23 12:39:55 +02:00
Laurent Destailleur
dbc2eddcba Prepare for 3.3.2 2013-04-23 12:09:21 +02:00
Laurent Destailleur
3f1f065d4e Fix: log must use the mask defined into setup 
Conflicts:
	htdocs/core/modules/syslog/mod_syslog_file.php
 2013-04-23 12:02:56 +02:00
Laurent Destailleur
39d3d1a34e Enhance script to send email to sale representatives 2013-04-23 12:00:31 +02:00
Laurent Destailleur
78a0c7ace2 Fix: log must use the mask defined into setup 2013-04-23 12:00:02 +02:00
Laurent Destailleur
ff3b2933a8 Fix: Removed bad test 2013-04-23 10:42:10 +02:00
Laurent Destailleur
c8b2ce3d8e Removed warning 2013-04-22 20:46:53 +02:00
Laurent Destailleur
494e9dbe18 Removed warning 2013-04-22 20:45:47 +02:00
Laurent Destailleur
6f5ce77846 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 20:42:25 +02:00
Laurent Destailleur
4e939f558a Restore font weight 2013-04-22 20:41:38 +02:00
Laurent Destailleur
dabd68aba6 Merge pull request #866 from atm-maxime/develop 
Fix : column missing in migration for price by qty
 2013-04-22 11:40:17 -07:00
Laurent Destailleur
83e873dd24 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-22 20:37:28 +02:00
Laurent Destailleur
9135fd0272 Merge pull request #868 from jfefe/webservices 
New webservice to retrieve a document (work on invoice, propal, order and generic
 2013-04-22 11:35:35 -07:00
Laurent Destailleur
2c4515f40e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 20:00:01 +02:00
Laurent Destailleur
5d74f228d8 Removed version into trigger page (version on trigger is useless since 
trigger depend on module. Only version of module is required).
 2013-04-22 19:59:41 +02:00
Regis Houssin
81333c700b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 16:45:15 +02:00
Regis Houssin
7f6a87ab35 FIXME regresion if code with not in numeric base 2013-04-22 16:44:25 +02:00
Regis Houssin
f8ddd69ccb FIXME regresion if code with not in numeric base 2013-04-22 16:42:44 +02:00
Maxime Kohlhaas
a747ef6939 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-04-22 16:38:13 +02:00
simnandez
de5a57a3c8 Fix: Uniformize creation in orders 2013-04-22 16:23:59 +02:00
Regis Houssin
7217d91f13 Fix: missing commit 2013-04-22 15:26:45 +02:00
Regis Houssin
28757c8d88 Fix: missing commit 2013-04-22 15:26:14 +02:00
Regis Houssin
ccf809b14a Fix: broken features 2013-04-22 15:10:15 +02:00
Regis Houssin
29a8c10504 Fix: broken features 2013-04-22 15:09:19 +02:00
jfefe
b5e66cc492 Mutualize code for security check when accessing a document by document.php and bywebservice 2013-04-22 15:00:29 +02:00
Regis Houssin
733872e9c9 Fix: merge problem 2013-04-22 14:48:08 +02:00
Regis Houssin
5ccb4108d4 Fix: merge problem 2013-04-22 14:47:37 +02:00
Regis Houssin
1be6a2c120 Fix: broken features for fileupload 2013-04-22 14:39:25 +02:00
Regis Houssin
7883e4f0eb Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-22 14:38:38 +02:00
Regis Houssin
63a5aee80e Fix: broken features for fileupload 2013-04-22 14:37:18 +02:00
jfefe
28cbe7d0b3 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices 2013-04-22 14:34:11 +02:00
Laurent Destailleur
e65e6516c5 Fix: Logon theme on amarok 2013-04-22 14:33:47 +02:00
Laurent Destailleur
88fe3e86f2 Missing translation 2013-04-22 14:01:47 +02:00
Laurent Destailleur
b9dab6d059 Fix: Korting 2013-04-22 13:57:24 +02:00
jfefe
60382f4b2c New webservice to retrieve a document (work on invoice, propal, order and generic) 2013-04-22 13:18:40 +02:00
Laurent Destailleur
ed4c18b9d3 Update changelog. 
Fix: Fix template ODS.
 2013-04-22 13:15:33 +02:00
Laurent Destailleur
6adaf2fa8f Fix: Pb when using virtual products inside virtual products 2013-04-22 13:02:10 +02:00
Laurent Destailleur
335c8cd511 Look: Minor change 2013-04-22 13:01:38 +02:00
Laurent Destailleur
c87c7703cd Qual: Make code simpler. 2013-04-22 13:01:22 +02:00
Laurent Destailleur
54040bed1d Fix: No slash alone 2013-04-22 12:48:56 +02:00
Laurent Destailleur
5b4b058399 Perf: Minor perf enhancement 2013-04-22 12:30:52 +02:00
Maxime Kohlhaas
882da5d7d7 Fix : price by quantity, bad column name 2013-04-22 11:54:30 +02:00
Laurent Destailleur
5cbb0359aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd Fix: Some translation change to have things more clear. 2013-04-22 10:33:06 +02:00