Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 03:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,115 Commits 39 Branches 191 Tags
a76c2f500e291ce7ad3003abcbc6240451c67eda
Commit Graph

37115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a76c2f500e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-23 22:37:25 +02:00
Laurent Destailleur
02facd0a7e Update doc 2013-05-23 22:37:07 +02:00
Laurent Destailleur
e9f964978d Merge pull request #974 from cbattarel/develop 
fix bug when creating fichinter from order
 2013-05-23 12:50:32 -07:00
Laurent Destailleur
44434e2689 Merge pull request #973 from atm-maxime/develop 
Reset every month with @99 was not working properly.
 2013-05-23 12:50:17 -07:00
Christophe Battarel
ebb8171d28 fix bug when creating fichinter from order (create function should receive $user as parm) 2013-05-23 11:36:00 +02:00
Maxime Kohlhaas
53c6638a90 Reset every month with @99 was not working properly. 2013-05-23 11:07:56 +02:00
Laurent Destailleur
a9fe9cf0b2 Merge pull request #972 from LProemer/develop 
Fix: 'rights' instead of 'right'
 2013-05-22 07:28:26 -07:00
Lukas Prömer
f1d9a6545c Fix: 'rights' instead of 'right' 2013-05-22 14:59:21 +02:00
Laurent Destailleur
99438926db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-22 12:24:05 +02:00
Laurent Destailleur
e9df560b74 New: Show process id in all command line scripts 2013-05-22 12:23:42 +02:00
Laurent Destailleur
edf00db0e0 Merge pull request #970 from FHenry/develop 
Add generic behaviour in showphoto of html.form.class.php
 2013-05-22 02:57:21 -07:00
Laurent Destailleur
f6f93eeec0 Merge pull request #967 from cbattarel/develop 
add ability to include products on intervention card
 2013-05-22 02:55:55 -07:00
Laurent Destailleur
0bffb6e654 Fix: Test error code 2013-05-22 11:43:16 +02:00
Laurent Destailleur
a61f6194ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-22 11:29:37 +02:00
Laurent Destailleur
0d562347fb Add a protection into test mode 2013-05-22 11:29:19 +02:00
simnandez
8d9b1e4788 Fix: Show date formatted 2013-05-22 10:51:45 +02:00
Christophe Battarel
c69a44d6e9 fix wrong construction of description when creatin from orders (it was putting a mess on update) 2013-05-22 10:23:26 +02:00
fhenry
40827a7ef3 Add generic behaviour in showphoto of html.form.class.php 2013-05-21 14:52:39 +02:00
Laurent Destailleur
8fe45b1af6 Manifest usage is useless for a dynamic application like dolibarr. 2013-05-21 14:41:11 +02:00
Christophe Battarel
c97384d5db restore UNIX type (LF) 2013-05-21 12:32:41 +02:00
Christophe Battarel
4b1ae9e9a9 add ability to include products on intervention card (some companies prefer to have both products and services on the intervention card that they give to their consultant) 2013-05-21 11:44:11 +02:00
Laurent Destailleur
12681994ea Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/fichinter/fiche.php
 2013-05-20 21:21:03 +02:00
Laurent Destailleur
91d1f9d48b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-20 21:04:22 +02:00
Laurent Destailleur
7ef45b9226 Can force out email 2013-05-20 21:04:00 +02:00
Laurent Destailleur
4539f6ce58 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-20 19:26:24 +02:00
Laurent Destailleur
6db07ac2d8 Fix: Several bugs into filter on statistics pages. 2013-05-20 19:24:27 +02:00
simnandez
1470b75e5c Trad: Fix Catalan words into Spanish 2013-05-20 18:44:41 +02:00
simnandez
3f1dabb4e2 Trad: Fix Catalan words into Spanish 2013-05-20 18:43:21 +02:00
Laurent Destailleur
53c053604f Merge pull request #966 from FHenry/3.4 
Fix bug on service date strat date end in propal line not recorded
 2013-05-20 09:02:15 -07:00
fhenry
250b6d6502 Fix bug on service date strat date end in propal line not recorded 2013-05-20 17:58:03 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-05-20 17:37:08 +02:00
Laurent Destailleur
e00df58153 Merge pull request #965 from grandoc/3.4 
fix: wrong trad
 2013-05-20 07:46:26 -07:00
Laurent Destailleur
d5be4192db Merge pull request #963 from FHenry/develop 
Triggger ficheinter line
 2013-05-20 07:46:17 -07:00
Laurent Destailleur
416cdd2f9c Merge pull request #956 from cbattarel/3.3 
fix bug : external users should not see costprice and margin infos
 2013-05-20 07:39:39 -07:00
Laurent Destailleur
2321170540 Merge pull request #964 from FHenry/3.4 
Revert Class rewrite and ficheinter line trigger
 2013-05-20 07:35:11 -07:00
Grand Philippe
5f714f1403 fix: wrong trad 2013-05-20 14:39:27 +02:00
Christophe Battarel
f8ca842685 fix typo error 2013-05-20 10:10:34 +02:00
fhenry
cb182752cc Report divert bug fixing from 3.4 2013-05-19 18:47:14 +02:00
fhenry
3d409390a5 Revert Class rewrite and ficheinter line trigger 2013-05-19 18:37:38 +02:00
fhenry
6407139b04 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-19 18:28:43 +02:00
fhenry
71107f8dca Triggger ficheinter line 2013-05-19 18:28:27 +02:00
Laurent Destailleur
2ac738d8c4 Merge pull request #955 from FHenry/3.4 
Fix error management and SQL resquest in action comm
 2013-05-19 09:02:00 -07:00
fhenry
a6233a738c Fix trigger in deleteline fiche inter 2013-05-19 14:13:41 +02:00
Christophe Battarel
fea0e6de54 Fix - external users should not see costprice and margin infos 2013-05-19 14:06:51 +02:00
Christophe Battarel
347fc6d714 fix unauthorized access to margins for external user 2013-05-19 14:04:21 +02:00
Marcos García
0a5bb491d3 Corrected translation key BuyingPrice from lang files 2013-05-19 12:24:19 +02:00
Juanjo Menent
afddded13c Merge pull request #962 from marcosgdf/translations 
Corrected translation key BuyingPrice from lang files
 2013-05-19 03:22:54 -07:00
Marcos García
4318d5c02d Missing succes message in margin module config page 2013-05-19 12:19:31 +02:00
Juanjo Menent
bd712262b6 Merge pull request #961 from marcosgdf/minor 
Missing success message in margin module config page
 2013-05-19 03:18:50 -07:00
Marcos García
5f4433dbff Missing succes message in margin module config page 2013-05-19 12:09:34 +02:00