Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
39,045 Commits 36 Branches 189 Tags
4958d17d248a5f5ff403274bd437c0ab34a7d888
Commit Graph

3202 Commits

Author SHA1 Message Date
Laurent Destailleur
3f94af792b Fix: security sql injection 2013-10-07 22:49:33 +02:00
Laurent Destailleur
47a9837046 Uniformize ref_customer into list 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
 2013-10-07 21:58:12 +02:00
Florian Henry
d41ceae64a - New: Can choose contact on event (action com) creation, and filtred by 
thirdparty
 2013-10-01 18:11:53 +02:00
Laurent Destailleur
8e72727163 Add hidden option MAIN_ADD_EVENT_ON_ELEMENT_CARD because the new feature 
to have a button to create an event is not a "workflow" action so should
not appears with action buttons but somewhere else on page.
 2013-09-26 14:06:15 +02:00
Laurent Destailleur
ca24b45aa9 Merge pull request #1101 from PaulPoulain/940-develop 
940 develop
 2013-09-26 05:00:57 -07:00
Laurent Destailleur
5ea7c34956 Fix: Opening agenda for a specific day 
Fix: No picto of thirdparty of contact if link is broken
 2013-09-25 21:26:06 +02:00
Laurent Destailleur
065c87d81c Qual: uniformize code: property ->tel on objects is now ->phone 
everywhere
 2013-09-25 19:58:22 +02:00
Laurent Destailleur
2088eaa6fd Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2013-09-24 13:17:58 +02:00
Laurent Destailleur
a674af5bcd Fix: Permission check on event tabs 2013-09-24 11:11:59 +02:00
Laurent Destailleur
bdafcb680f Fix: Bad parameters 
Conflicts:
	htdocs/comm/action/fiche.php
 2013-09-23 21:07:13 +02:00
Laurent Destailleur
99de8b22a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-23 19:59:52 +02:00
Laurent Destailleur
94f28a93de Fix: Bad parameters 2013-09-23 19:53:55 +02:00
Laurent Destailleur
3fde695c94 Qual: Uniformise name of include files we use to share common code found 
into Actions area of pages (controllers).
 2013-09-23 13:22:28 +02:00
Laurent Destailleur
2bf4a2bdb8 Missing project label 2013-09-22 21:02:42 +02:00
Laurent Destailleur
d478d8c1fe Fix: Permission to read an event should depend on agenda module 
permissions.
We add a check for thirdparty for external users
 2013-09-18 11:56:42 +02:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
949b8c6274 Mark method classer_facturee deprecated. 
Make better translation of some workflow options.
 2013-09-16 11:50:53 +02:00
Laurent Destailleur
6ad569a511 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-13 16:21:02 +02:00
Laurent Destailleur
82f4d588fc Fix: Can't search on proposals 2013-09-13 16:17:19 +02:00
Laurent Destailleur
b1add3f9df Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/propal/class/propal.class.php
	htdocs/contrat/class/contrat.class.php
 2013-09-13 09:32:41 +02:00
simnandez
002e248f00 Fix: [ bug #1062 ] Documents lost in propals and contracts validating 2013-09-12 16:55:49 +02:00
simnandez
817569d487 Fix: [ bug #1062 ] Documents lost in propals and contracts validating 2013-09-12 16:54:47 +02:00
simnandez
b36dc08e00 Remove unnecessary code 2013-09-12 09:59:23 +02:00
simnandez
699414cab7 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-10 18:45:16 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Laurent Destailleur
1b526b7aa5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/facture/index.php
 2013-09-09 20:00:12 +02:00
Christophe Battarel
9fa37fc5f1 Fix: Edit propal line was losing product supplier price id 
Conflicts:
	ChangeLog
 2013-09-08 21:51:08 +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
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