lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,673 Commits 43 Branches 150 Tags 886 MiB
a9ca9c04ef
Commit Graph

38673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cédric Salvador
a9ca9c04ef Fixed request returning nothing when there's no records in llx_product_stock 2013-09-06 09:56:06 +02:00
Cédric Salvador
0a6079934b alertonly checkbox stays checked 2013-09-06 09:56:06 +02:00
Cédric Salvador
41ad9bdb7f frenglish is bad 2013-09-06 09:56:06 +02:00
Cédric Salvador
6015a36183 filter on stock alert 2013-09-06 09:56:06 +02:00
Cédric Salvador
bbae47c48f natural search 2013-09-06 09:56:06 +02:00
Cédric Salvador
b58297a791 fixed warning showing up when searching 2013-09-06 09:56:05 +02:00
Cédric Salvador
6a51f5f87a don't jump to the product card when there's only one research result 2013-09-06 09:56:05 +02:00
Laurent Destailleur
d7a14a15b3 Fix: Bad link 2013-09-06 09:26:23 +02:00
Laurent Destailleur
181f16543d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	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/filefunc.inc.php
 2013-09-06 01:42:40 +02:00
Laurent Destailleur
17fcceb872 Fix: typo 2013-09-06 01:38:13 +02:00
Laurent Destailleur
f45be6a2a7 Prepare for 3.4.1 
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	build/debian/changelog
 2013-09-06 01:37:07 +02:00
Laurent Destailleur
5db9505f40 Fix debian package 2013-09-06 01:30:49 +02:00
Laurent Destailleur
a9c14c80f0 Fix: debian files 2013-09-06 01:27:11 +02:00
Laurent Destailleur
c40f3df269 Update doc 2013-09-06 01:26:31 +02:00
Laurent Destailleur
38e4b0f9ac Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/watch
 2013-09-05 23:57:30 +02:00
Laurent Destailleur
10779baadd Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-05 23:55:14 +02:00
Laurent Destailleur
c71c4e86f6 Fix: watch file for debian package. 2013-09-05 23:52:13 +02:00
Laurent Destailleur
556827c818 Fix: wash file 2013-09-05 22:58:11 +02:00
Laurent Destailleur
d493dc8513 Merge pull request #1215 from GPCsolutions/develop-review 
Develop review
 2013-09-05 13:51:28 -07:00
Raphaël Doursenaud
36a281ce58 CSS fixes 2013-09-05 20:54:19 +02:00
Raphaël Doursenaud
8010389c08 Fixed wrong path in CSS 2013-09-05 20:29:06 +02:00
Raphaël Doursenaud
d39f2d655c Typo fix: remove unwanted comma 2013-09-05 20:28:24 +02:00
Raphaël Doursenaud
0e8eddb470 Revert "Method should be static" 
This reverts commit 4ca5bc3797.
 2013-09-05 19:00:00 +02:00
Raphaël Doursenaud
e762042828 Fixed typos 2013-09-05 18:06:51 +02:00
Raphaël Doursenaud
6e64e0e7be Fixed gd calls for windows bitmap images 2013-09-05 17:56:28 +02:00
Laurent Destailleur
b1e8b9c02f Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-05 17:56:23 +02:00
Laurent Destailleur
2ce6f55d92 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-09-05 17:54:00 +02:00
Laurent Destailleur
7afb1aef14 Fix: Image was not correctly generated. Bad licence into it. 2013-09-05 17:53:07 +02:00
Juanjo Menent
15bb60c8a1 Merge pull request #1212 from FHenry/develop 
Add ref supplier into muscadet model
 2013-09-05 08:30:49 -07:00
Raphaël Doursenaud
cd684460ff Removed silly code 2013-09-05 17:30:17 +02:00
Raphaël Doursenaud
7681c60f6b Silly assignment was a bug 2013-09-05 17:22:51 +02:00
Raphaël Doursenaud
fa51e310b8 Avoid silly assignment 2013-09-05 17:19:30 +02:00
Raphaël Doursenaud
9046d620e1 Avoid using the same var as outer loop 2013-09-05 17:15:06 +02:00
Raphaël Doursenaud
8e6860ac72 Fixed developer intent 2013-09-05 17:01:15 +02:00
Raphaël Doursenaud
4efe215b0c Qual: removed a bunch of duplicated array keys 2013-09-05 17:00:18 +02:00
Raphaël Doursenaud
465d59ba82 Don't call non static class statically 2013-09-05 16:44:57 +02:00
Raphaël Doursenaud
4ca5bc3797 Method should be static 2013-09-05 16:44:02 +02:00
Raphaël Doursenaud
0c0740cac7 Don't call non static class statically 2013-09-05 16:43:22 +02:00
Raphaël Doursenaud
109cc09e82 Simplified JS 2013-09-05 16:37:23 +02:00
simnandez
d4e62805ef Fix: service to expire instead invoice unpayed 2013-09-05 16:13:30 +02:00
Laurent Destailleur
7229b728a3 Update doc 2013-09-04 23:02:02 +02:00
Laurent Destailleur
da7c8b42f2 Fix: Image was not correctly generated. Bad licence into it. 2013-09-04 22:34:49 +02:00
Laurent Destailleur
c3c9e59974 Fix: Image was not correctly generated. Bad licence into it. 2013-09-04 22:33:49 +02:00
Laurent Destailleur
e40d644085 Fix: Remove warning 2013-09-04 16:49:20 +02:00
Laurent Destailleur
10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang
 2013-09-04 15:13:38 +02:00
Laurent Destailleur
af22d38681 Fix: Bad total without tax 2013-09-04 15:07:35 +02:00
Laurent Destailleur
5d27ce0173 Merge pull request #1213 from open-minds/develop 
Fix owner address of company bank account
 2013-09-04 01:48:00 -07:00
Laurent Destailleur
b1c25d91cd Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-04 10:45:35 +02:00
Laurent Destailleur
ee0f44c9e3 Fix: Try a fix of cloning lines->array 2013-09-04 10:45:15 +02:00
Laurent Destailleur
232cf5e086 Merge pull request #1214 from aspangaro/3.4 
Update translation fr_FR
 2013-09-04 01:26:30 -07:00