Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
42,407 Commits 36 Branches 189 Tags
aabbc331a4eac871e7e1e05fbc4928cf3d20e4aa
Commit Graph

301 Commits

Author SHA1 Message Date
Laurent Destailleur
56c067f15c Fix: form is not allowed inside a table 
Conflicts:
	htdocs/fichinter/fiche.php
 2014-07-06 21:16:27 +02:00
Laurent Destailleur
dce0c38533 Fix: Add hidden option so we can restore old behaviour (duration is 
free) for people that can't work with new one.
 2014-06-21 16:06:59 +02:00
Maxime Kohlhaas
1250804e81 Fix 1490 $this instead of $object 2014-06-14 11:42:17 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
ded5d47afc Fix: multilangs array was not loaded. 2014-03-12 01:21:18 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
b6cefee45a Fix: [ bug #1240 ] traduction 2014-03-01 15:21:11 +01:00
Laurent Destailleur
2534da9a9f Merge pull request #1422 from defrance69/patch-31 
Update fiche.php
 2014-02-24 10:33:40 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
BENKE Charles
05865a7978 Update fiche.php 
somme other error
 2014-02-18 15:49:16 +01:00
BENKE Charles
64074305d3 Update fiche.php 
double line
 2014-02-18 15:22:45 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-16 19:47:51 +01:00
Laurent Destailleur
191ff05873 Fix: W3C. 2014-02-12 18:36:49 +01:00
Laurent Destailleur
ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	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/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
5b89bc18f5 [ bug #1231 ] PDF always generated in interventions 2014-02-08 02:46:05 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00
Cédric Salvador
c885389ac6 included the FormContract class to avoid fatal error 2013-11-19 14:23:17 +01:00
Laurent Destailleur
190dabc3f7 Fix: Tons of bugs with extrafields feature. 2013-11-05 13:11:36 +01:00
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
Raphaël Doursenaud
e762042828 Fixed typos 2013-09-05 18:06:51 +02:00
Florian Henry
8fb2b8fa12 Start normalize project module : create html.formprojet.class.php with 
selec_project
 2013-06-14 22:33:01 +02:00
Laurent Destailleur
a50cd7b698 Fix bug into script that fix CRLF into LF 2013-06-12 11:59:55 +02:00
Laurent Destailleur
482a771e7c Fix: Some quality fixes 2013-06-10 19:04:04 +02:00
BENKE Charles
b42a3a716d Update fiche.php 
change the call of select_contract function
 2013-06-09 22:15:37 +03:00
Grand Philippe
db6d226ffd code was displayed twice 2013-06-06 09:22:26 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
BENKE Charles
d331596d19 Update fiche.php 
Add contract link
 2013-06-03 01:49:49 +02: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
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
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
fhenry
3d409390a5 Revert Class rewrite and ficheinter line trigger 2013-05-19 18:37:38 +02:00
fhenry
71107f8dca Triggger ficheinter line 2013-05-19 18:28:27 +02:00
fhenry
c07d5045d1 Error management 2013-05-19 11:55:03 +02:00
fhenry
a8e1d111c3 Add trigger into ficheinter lines and $user pass trought parameters 
every where
 2013-05-19 10:26:25 +02:00
fhenry
cbf29e20a2 [ task #901 ] Add Extrafeild on Fiche Inter 2013-05-18 13:00:36 +02:00
fhenry
5d73ce4023 [ task #901 ] Add Extrafeild on Fiche Inter 2013-05-18 12:53:11 +02:00
fhenry
fefb21a56e Fix bug on Extrafield checkbox 
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
 2013-05-18 12:17:43 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Raphaël Doursenaud
13c48d4970 Fixed more private note updates 2013-04-20 06:43:14 +02:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
simnandez
50548601ce Resolve conflicts 2013-04-06 08:20:57 +02:00
Laurent Destailleur
76910d4159 Look: Start to use div to render actions buttons 2013-04-03 18:37:54 +02:00
jfefe
50e620e839 Better management for linked objects on intervention card. 
- Display linked object as invoice
- When origin & originid defined, page was blank after submit creation form
 2013-04-02 15:34:45 +02:00
Laurent Destailleur
a5e66ab7ba Generalize fix: file with a specific mask not found, again 2013-03-30 13:54:46 +01:00
fhenry
8971e6fe15 [ task #710 ] Envoi de mail 2013-03-23 14:39:23 +01:00