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

402 Commits

Author SHA1 Message Date
Laurent Destailleur
80fc4743c9 Fix the property "list" was not used. 2015-08-24 14:42:07 +02:00
philippe grand
d51912687b the form should be outside table to avoid errors 2015-08-15 15:37:54 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
Laurent Destailleur
5a8e763099 Uniformize code for hooks 
Uniformize page name societe.php into list.php
 2015-06-22 15:48:48 +02:00
Laurent Destailleur
fb1a3f3ea3 Rename alternative name 2015-06-16 12:04:11 +02:00
Marcos García de La Fuente
a496606826 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/soc.php
 2015-06-13 02:45:42 +02:00
Laurent Destailleur
4c7ccf6145 NEW Can filter on contact status in prospect list. Removed deprecated 
menu entry.
 2015-06-05 10:49:02 +02:00
Marcos García de La Fuente
460a2ec2ab Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/categories/categorie.php
	htdocs/comm/prospect/list.php
 2015-05-25 15:09:46 +02:00
Raphaël Doursenaud
becc240b92 Include Categories class whenever Categorie::TYPE is used 2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7 Added types constants to categories 2015-05-23 18:52:31 +02:00
Laurent Destailleur
390c7d8e65 Fix link to prospect with filter on commercial status 
Enhance natural_search method to allow to search on several ids.
 2015-05-22 15:19:27 +02:00
Marcos García de La Fuente
ce7ed70d74 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2015-05-10 12:23:07 +02:00
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Laurent Destailleur
b71e5a1025 Merge pull request #2673 from aternatik/fix_getentity 
Fix : missing getEntity calls
 2015-05-07 00:48:19 +02:00
Laurent Destailleur
3a8cf17f3c NEW Can edit list of prospect status for customers/prospects. Add a new 
entry into dictionary table to manage list fo status.
Removed deprecated files.
 2015-05-06 23:13:07 +02:00
Laurent Destailleur
e73526b29c Fix prospect box must use the getNomUrl method 2015-05-04 12:42:45 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
Marcos García de La Fuente
15b1f03a08 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/list.php
	htdocs/comm/prospect/list.php
	htdocs/societe/consumption.php
	htdocs/societe/soc.php
 2015-04-19 00:48:07 +02:00
jfefe
25812f0071 Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
jfefe
3825b89ead Change companies and product title picto 2015-04-18 23:13:48 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Marcos García de La Fuente
8b8171c700 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/card.php
 2015-03-30 03:25:57 +02:00
Laurent Destailleur
bbef07ef3d Finished prototype to use hook to add a column by a module. 2015-03-18 14:08:37 +01:00
Marcos García de La Fuente
2ba795fcbc NEW: [ task #851 ] Add a new field: Commercial name 2015-02-28 14:30:06 +01:00
Sof
ba80bbb291 FIX; Unknown field 'sc.fk_soc' in field list 2015-02-20 17:33:58 +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
Marcos García de La Fuente
023175b9f1 PHPDoc and misc fixes for several folders 2015-02-10 11:38:13 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +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
01e6d9fc12 Update /comm/prospect/list.php 2014-11-23 17:45:00 +01:00
Frédéric FRANCE
c6f7134414 Update /comm/prospect/list.php 2014-11-23 10:01:07 +01:00
aspangaro
bebf039599 Prospects list 2014-11-02 15:05: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
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Florian HENRY
fb277bbbab fix llx_societe.datea call in request 2014-05-13 19:32:04 +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
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
Laurent Destailleur
ed40e6d9b0 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/langs/en_US/bills.lang
 2013-12-14 15:44:10 +01:00
Laurent Destailleur
6cc20cb731 Fix: Filter on third parties were wrong for external users. 2013-12-14 15:21:15 +01:00
Florian Henry
a73275b9c1 Add prospect code client into prospect list 2013-11-13 13:17:32 +01:00
Florian Henry
6bf2220a67 Add status filter into prospect and customer list 2013-11-12 15:22:11 +01: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
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
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
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
1cf2276584 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/prospect/list.php
 2013-04-05 22:59:06 +02:00
fhenry
09d1e56ca5 Fix [ bug #794 ] Lost filter on zipwode in prospect list 2013-04-05 13:01:15 +02:00
Laurent Destailleur
f52fe71018 Fix: Bad div closing 2013-03-30 19:40:52 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
55f9879a6c Replace table with div. Prepare work for android application. 2013-03-16 14:53:15 +01:00
Laurent Destailleur
931b556b69 Fix: sql error 2013-03-04 00:01:38 +01:00
Grand Philippe
44683a0e21 english language standardization 2013-02-27 11:58:50 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
a582fd3f15 english standardization 2013-02-22 16:14:52 +01:00
fhenry
f65f0e3f11 Remove debug string in buf correction of task 350 2013-02-14 15:27:48 +01:00
fhenry
d41e754f43 Fix bug on task 350 2013-02-14 15:08:22 +01:00
fhenry
82fc8e1536 Task 350 in Doliforge 2013-02-12 19:16:48 +01:00
fhenry
6ad617842d Commit temporaire 2013-02-12 15:31:12 +01:00
simnandez
ad91eab0ac [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 
Uniformize propal code (not use addpropal.php)
 2013-02-02 18:31:45 +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
Marcos García
c8eac78a8d Translated labels that weren't being translated and improved es_ES translations 2012-12-29 00:24:55 +01:00
Regis Houssin
4ec1d376bf Fix: strict mode journey 2012-11-13 09:02:21 +01:00
Regis Houssin
1c84dbaeec Fix: missing zipcode in url 2012-10-24 12:27:43 +02:00
Regis Houssin
87d44c845d Fix: restrict the search in the beginning 2012-10-24 11:18:15 +02:00
Regis Houssin
a240343482 Fix: add possibility to filter with zipcode (very important) 2012-10-22 11:05:55 +02:00
Regis Houssin
f89e3238ee New: try to use hooks for customizing lists 2012-10-22 10:49:16 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Laurent Destailleur
2c2d17b101 Fix: Try a fix to avoid having the hover on array that should not have 
it.
 2012-09-09 13:13:24 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +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
Marcos García
0e108226da FeatureNotYetAvailable wasn't being translated 2012-08-03 14:05:28 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Regis Houssin
251640561f Fix: strict mode happy hour 2012-07-28 12:35:11 +02:00
Laurent Destailleur
7883124958 New: [ task #454 ] Add "No category" into filters on category 2012-07-28 00:53:51 +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
ed41e03589 Qual: Fix a ton of CheckStyle errors 2012-03-18 19:23:01 +01:00
Regis Houssin
0c8686b5b4 Fix: possibility to use alternative addresses management 2012-03-14 15:04:55 +01:00
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
Laurent Destailleur
4ce9e70775 New: Add agenda tab into member cards. 
Uniformize a lot of code.
 2012-02-13 01:43:35 +01:00
Regis Houssin
1bac15d836 Fix: missing quotes 2012-02-02 07:49:50 +01:00
Regis Houssin
f2df94bf32 Fix: for shared thirdparties 
Conflicts:

	htdocs/core/class/html.form.class.php
	htdocs/societe/societe.php
 2012-02-01 15:04:31 +01:00
Regis Houssin
4431510ce4 Fix: use entity field of object 2012-02-01 11:32:55 +01:00
Regis Houssin
b670de36a9 Fix: add entity 0 for users and groups 2012-01-11 22:08:25 +08:00
Regis Houssin
9339119455 New: use getEntity() instead $conf->entity 2012-01-11 21:16:10 +08:00