Commit Graph

5374 Commits

Author SHA1 Message Date
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
lalaina rasamoelina
ca6a973d96 T940-develop: creating a bouton which permit to create an event in the propal,and command .
If we create an event in the propal, then  the events will be attached in the propal
		and if it's for command,it will be attached in the command
2013-08-27 15:51:06 +02:00
Laurent Destailleur
657c4d6e90 Fix: Fix graph for product distribution.
Add limit and add entry other.
2013-08-27 11:54:07 +02:00
Christophe Battarel
29d329a1d2 ability to define margin rate on quotes, orders, invoices
more to come : same on edit, user permissions
2013-08-12 15:34:09 +02:00
Laurent Destailleur
59c1f54d68 New: Enhance DolGraph class for pie charts. 2013-08-09 19:19:48 +02:00
Laurent Destailleur
4f9a1768d5 Work on graphical box with product distribution 2013-08-08 14:36:35 +02:00
Laurent Destailleur
7a8d28f135 Several fix for last pull request:
- A property of an element must be shown under another element
- Property that may be page content must not be output into a list.
- Bad W3C (<br> must not be <br />)
- Must not use picto to edit a property to define a link to a page
(replaced with generic sheet picto).
2013-08-06 19:12:26 +02:00
Laurent Destailleur
480355f4f0 Merge pull request #1158 from PaulPoulain/960-develop
T960-develop : Put the note_private in the propal list
2013-08-06 09:44:10 -07:00
lalaina rasamoelina
2e25d17372 T960-develop : Put the note_private in the propal list
In the propal list, if there are the private notes,we print them and we can edit them
htdocs/comm/propal/list.php
2013-08-06 16:41:36 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1 Fix: print of a function that already contains the print. 2013-07-27 14:10:57 +02:00
jfefe
020c0f33a0 Check required extrafields on proposals 2013-07-26 15:42:32 +02:00
Laurent Destailleur
9c88c03860 Fix: missing css class on tr 2013-07-25 13:56:07 +02:00
Laurent Destailleur
ad783cc4f1 Merge pull request #1112 from PaulPoulain/949-develop
949 Put the ref_client in the subject mail
2013-07-19 06:59:49 -07:00
Laurent Destailleur
9e283f98e8 Fix: removed deprecated nowrap tag
Add changelog entry
2013-07-19 15:58:07 +02:00
Laurent Destailleur
11f339eca4 Merge pull request #1111 from PaulPoulain/956-develop
956 - Possibility to edit the ref_client when we want
2013-07-19 06:54:24 -07:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
83b5c193f7 Fix: move search_ville into search_town (search_ville no more used into
3.5).
2013-07-19 14:00:08 +02:00
Laurent Destailleur
2814aeec1d Merge pull request #1109 from PaulPoulain/930-develop
Put the town in the list of propal
2013-07-19 04:53:51 -07:00
Laurent Destailleur
d5ca2f9f40 Fix: forged select for stats where wrong when filtering on a thirdparty
Conflicts:
	htdocs/compta/facture/class/facturestats.class.php
2013-07-18 15:37:14 +02:00
Laurent Destailleur
1b70ecdb26 Fix: forged select for stats where wrong when filtering on a thirdparty 2013-07-18 15:25:25 +02:00
lalaina rasamoelina
913f4d94cc Put the ref_client in the subject mail 2013-07-18 12:39:50 +02:00
lalaina rasamoelina
3dac43f27a Possibility to edit the ref_client when we want 2013-07-18 11:05:50 +02:00
lalaina rasamoelina
29094c9623 Put the town in the list of propal 2013-07-18 09:20:18 +02:00
Florian Henry
d09af2b18e Better use of reopen method 2013-07-15 09:37:55 +02:00
Florian Henry
9d0fe3c1da Use reopen method to repoen proposal and fire trigger PROPAL_REOPEN 2013-07-15 09:33:26 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
a4abfe1abc New: Can add an event automatically when a projet is create. 2013-07-10 14:46:16 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
BENKE Charles
94772dbe30 Update fiche.php
change restricted area, too much agressive
2013-07-03 15:25:22 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	ChangeLog
	build/debian/changelog
	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/compta/facture/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
2013-06-25 21:31:24 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
7778a17a89 Qual: clean code from deprecated vars 2013-06-24 16:41:31 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
bcc9b81bab Merge pull request #1052 from PaulPoulain/943
T943: Put the total of the price at the bottom of the propal list
2013-06-19 09:29:29 -07:00
Marcos García
676191c1f9 Fix: [ bug #947 ] Can't create proposal lines with unit price = 0 2013-06-19 10:22:46 +02:00
Laurent Destailleur
8f60d60e8d Fix: Bad return url 2013-06-18 22:12:49 +02:00
Laurent Destailleur
73e3ef3a82 Fix: Bad return url 2013-06-18 22:12:17 +02:00
lalaina rasamoelina
e8f26ad33b T943 If there is only one page, we keep label "Total HT", but if there is more than one page, we use "Total HT for this page" 2013-06-18 10:59:19 +02:00
Laurent Destailleur
869e877cb7 Qual: We must not concat currency symbol after a price, but use the
parameter currency of method price.
2013-06-17 11:58:55 +02:00
Laurent Destailleur
9012c49299 Perf: Optimize class loading. Need 1 MB less of memory to load home
page.
2013-06-16 23:15:20 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
b40e2b85ca Merge pull request #1053 from FHenry/dev_projecthtmlform
Start normalize project module : create html.formprojet.class.php with …  selec_project
2013-06-15 15:25:57 -07:00
Laurent Destailleur
377f308d08 Merge pull request #1049 from PaulPoulain/935
T935 put a filter on the author in the propal list
2013-06-15 15:17:58 -07:00
Florian Henry
8fb2b8fa12 Start normalize project module : create html.formprojet.class.php with
selec_project
2013-06-14 22:33:01 +02:00