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

33351 Commits

Author SHA1 Message Date
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Laurent Destailleur
87a4418baf Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-06 10:50:44 +02:00
Laurent Destailleur
9fa6d4ccdf Fix: Avoid error for free products. Also add hidden otion to enable 
this. In most cases, we don't want to do this.
 2013-09-06 10:40:44 +02:00
Laurent Destailleur
d7a14a15b3 Fix: Bad link 2013-09-06 09:26:23 +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
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
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
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
aspangaro
91320ef99c Update translation fr_FR 2013-09-04 05:17:33 +02:00
Laurent Léonard
ec86efaab2 Fix owner address of company bank account 2013-09-03 23:57:36 +02:00
Florian Henry
d8ddb8b3e7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-03 20:07:13 +02:00
Florian Henry
b4d858828f Add ref supplier into muscadet model 2013-09-03 20:07:08 +02:00
Laurent Destailleur
64b44298ae Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-03 18:19:15 +02:00
Laurent Destailleur
c5020056b3 Revert commit. 
Bug into update function. Also what was difference of new field ?
 2013-09-03 18:18:22 +02:00
simnandez
6ae3603549 Trad: Add missing translations 2013-09-03 18:16:30 +02:00
Laurent Destailleur
23df3d82e5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-03 18:10:55 +02:00
Laurent Destailleur
3bfaadc054 Work on feature to change rule for vat calculation rounding 2013-09-03 18:08:50 +02:00
Grand Philippe
222eb18bb9 fix : 
Fatal error: Call to undefined function dol_time_plus_duree()
 2013-09-03 17:37:22 +02:00
Juanjo Menent
bcbe4e582c Merge pull request #1209 from grandoc/develop 
Add an additional description for the category products
 2013-09-03 06:25:39 -07:00
Grand Philippe
9f01aa51a3 fix regression 2013-09-03 15:19:03 +02:00
Grand Philippe
397d0e3b81 Add an additional description for the category products 2013-09-03 15:12:15 +02:00
Juanjo Menent
7293d58002 Merge pull request #1208 from grandoc/develop 
Add an additional description for the category products
 2013-09-03 02:43:30 -07:00
Grand Philippe
6d6f30725b Add an additional description for the category products 2013-09-03 11:41:33 +02:00
Laurent Destailleur
e40452f3b2 Fix: Bug if modules not enabled 2013-09-03 11:36:28 +02:00
Grand Philippe
dfdc9da781 Add an additional description for the category products 2013-09-03 11:15:19 +02:00
simnandez
614f376392 Trad: Fix bad descriptor 2013-09-03 09:25:14 +02:00
Laurent Destailleur
b02bf5a2a7 Syn with transifex 2013-09-03 00:42:54 +02:00