lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

486 Commits

Author SHA1 Message Date
fmarcet
015dedc3ab FIX: Show category selector if we have permission to view products or 
services
 2015-11-05 11:53:45 +01:00
Frédéric FRANCE
08dccf341c Update list.php 2015-10-31 11:24:49 +01:00
Laurent Destailleur
2122d4d43a NEW Contract module can be used to follow both sold and bought 
contracts/recurring subscriptions.
 2015-10-17 00:52:35 +02:00
Laurent Destailleur
537a13e2f4 NEW Show which fields are used for search when doing a generic search 
from the quick search form.
 2015-10-17 00:14:36 +02:00
Laurent Destailleur
61d739635e Uniformize code and css for tables. Filters must be implemented 
following example in test_arrays.php.
 2015-10-09 12:30:16 +02:00
frederic34
f2d7523091 Optioncss 2015-10-04 12:31:32 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +02:00
Laurent Destailleur
c28ff6c257 NEW Add status into filters of graph 2015-07-09 12:29:01 +02:00
Laurent Destailleur
251fedad48 NEW Can edit email template using WYSIWYG editor 2015-07-04 11:57:55 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
Laurent Destailleur
df1dfcbd8a NEW Can filter proposal on a tag of a product 
Enhance also the prototype test_arrays to include select form before
table.
 2015-06-08 15:07:37 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
jfefe
25812f0071 Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
Laurent Destailleur
9e4e9a5411 NEW: Can search on customer order amount into customer order list. 2015-03-06 20:59:18 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php
 2015-02-18 23:51:41 +01:00
Laurent Destailleur
e7d95f553b Merge remote-tracking branch 'origin/3.5' into 3.6 2015-02-18 23:43:22 +01:00
Christophe Battarel
3940abe7c1 FIX: select DISTINCT for natural search on proposal list (in the same 
way it's done in invoices list)
 2015-02-07 10:48:03 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Frédéric FRANCE
dd2b19d855 Typo 2014-12-09 22:45:27 +01:00
Laurent Destailleur
86a3a4f618 Merge branch '1680' of github.com:aspangaro/dolibarr into aspangaro-1680 
Conflicts:
	htdocs/comm/propal/list.php
 2014-11-22 15:57:06 +01:00
Laurent Destailleur
6c7bab8d8c Merge pull request #2045 from frederic34/patch-4 
#1682 Date is missing in proposals list
 2014-11-22 15:50:50 +01:00
Frédéric FRANCE
5536abecf7 #1683 Can't clear sort filter on proposals list 2014-11-17 23:57:01 +01:00
Frédéric FRANCE
f2eda0629b #1682 Date is missing in proposals list 2014-11-17 23:54:39 +01:00
aspangaro
de7a38417f #1680 Clear sort filter works partially in prospects list 2014-11-17 21:45:29 +01:00
aspangaro
acbbe823e8 Typo 2014-11-06 20:04:51 +01:00
aspangaro
df5d34266c Lost button 2014-11-02 15:26:20 +01:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Laurent Destailleur
33ef8595dc Fix: Bad alignement 2014-05-27 10:19:34 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Alexis Algoud
f13c146908 Fix page numerotation as in company list 2014-05-12 11:00:58 +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
3a2caa6e64 New: Can filter on status for supplier order. 2014-04-02 12:48:34 +02:00
Laurent Destailleur
270eaf7aca Qual: Uniformize search date for lists. 2014-03-06 17:02:27 +01:00
Grand Philippe
c5689b86b4 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 09:43:21 +01:00
simnandez
8e247e8615 Trad: Fix missing translation 2013-12-19 12:47:39 +01:00
Laurent Destailleur
42f032ded3 Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-14 01:30:15 +01:00
Laurent Destailleur
88aa0ad4da Fix: Doxygen problems 2013-12-14 01:28:59 +01:00
Laurent Destailleur
d39ed05c5d Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/propal/list.php
 2013-12-01 16:05:09 +01:00
Florian Henry
b9d37fd6f7 [ bug #1159 ] Commercial search "other" give p.note do not exists 2013-11-28 14:28:03 +01:00
braito4
e89c3fa074 Update list.php 
sql error.
 2013-10-30 11:51:23 +01:00
Florian Henry
bdcbd4ee42 Fix list propal and invoice to display customer ref if option is set 2013-10-22 12:47:26 +02:00
Laurent Destailleur
ef86f150be Fix: duplicate field 2013-10-08 12:25:41 +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
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
82f4d588fc Fix: Can't search on proposals 2013-09-13 16:17:19 +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
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
83b5c193f7 Fix: move search_ville into search_town (search_ville no more used into 
3.5).
 2013-07-19 14:00:08 +02:00
lalaina rasamoelina
29094c9623 Put the town in the list of propal 2013-07-18 09:20:18 +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
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
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
lalaina rasamoelina
feb7af490a T943: Put the total of the priceat the bottom of the propal list 2013-06-14 15:46:11 +02:00
lalaina rasamoelina
9649e731b8 T935 put a filter on the author in the propal list 2013-06-14 15:05:58 +02:00
Florian Henry
7c56da05b8 Add hook on propal/order/incoive list 2013-05-28 18:35:15 +02:00
Laurent Destailleur
52952c6fce Uniformize code for liste_array 
Fix visibility of elements into product page (manage external users)
 2013-04-27 15:08:35 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Regis Houssin
17d5ab9774 Fix: no result with a number with a comma 
Conflicts:
	htdocs/fourn/facture/index.php

Change-Id: I6c67e3d2936673ea0993adfa1597bd11caf125fe
 2013-04-19 09:57:13 +02:00
Regis Houssin
45300ccdd8 Fix: no result with a number with a comma 2013-04-19 09:55:22 +02:00
fhenry
82fc8e1536 Task 350 in Doliforge 2013-02-12 19:16:48 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
153997432f Fix: Several fix. 
New: Also allow to enter a payment with a negative value on an invoice
and positive onto other.
 2012-10-13 17:00:38 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Regis Houssin
f902fedbb8 Fix: split for more possibility 2012-09-13 17:43:24 +02:00
Regis Houssin
3c63307087 Fix: remove dead code 2012-09-06 12:30:03 +02:00
Regis Houssin
becda06fd6 Fix: security 2012-08-25 19:40:08 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
9451edafd8 Fix: bad link and uniformize code 2012-08-01 18:40:47 +02:00
Regis Houssin
77b9718473 Fix: strict mode street 2012-07-13 10:15:47 +02:00
Regis Houssin
94b7aed116 Fix: strict mode avenue 2012-07-12 19:14:13 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
db4008850b Fix: missing include 2012-06-23 22:25:40 +02:00
Laurent Destailleur
f2de43b771 New: Can filter list of proposal, order or invoice on sales 
representative
 2012-06-23 20:39:20 +02:00
Laurent Destailleur
864ca3090a Fix: [ bug #405 ] Late icon always displayed on comm/propal.php 2012-05-21 00:08:55 +02:00
Laurent Destailleur
f7263d1773 Fix: Do not lose filter 2012-05-05 20:07:34 +02:00
Laurent Destailleur
143e524db6 New: Can filter on contact 2012-05-05 17:45:17 +02:00
Laurent Destailleur
85f01691a0 Qual: Lists must be into a page list and not into same page than record. 
New: Add filter on contact into list.
 2012-05-05 17:28:52 +02:00