Commit Graph

214 Commits

Author SHA1 Message Date
BENKE Charles
8070030c45 Update box_project.php 2014-06-20 23:19:57 +02:00
BENKE Charles
ec1a6e1c29 Update box_task.php 2014-06-20 23:17:26 +02:00
BENKE Charles
754b028ec6 Update box_project.php 2014-06-18 22:19:28 +02:00
BENKE Charles
31c2815d0f Update box_task.php 2014-06-18 21:50:17 +02:00
BENKE Charles
c963a6d8a1 Create box_project.php
add box for project
2014-06-18 21:36:00 +02:00
BENKE Charles
ff31fff2d7 Create box_task.php
add boxes of tasks
2014-06-18 21:34:18 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +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
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +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
5f1e690039 New: Show invoice ref in boxes for supplier invoices. 2014-04-26 23:15:45 +02:00
BENKE Charles
a3a6b6dff6 Update box_ficheinter.php
External user show only is own intervention
2014-03-26 10:57:07 +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
df829177bc Fix: Submit form of graph box was reseting params of others. 2014-03-02 17:45:40 +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
c9b1c562cc Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-02-06 16:58:53 +01:00
Laurent Destailleur
7078970ed1 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2014-02-05 21:03:05 +01:00
Laurent Destailleur
e3ac9db9ec Fix: Data was encode twice making bad translation for language with
special chars.
2014-02-05 12:11:39 +01:00
Laurent Destailleur
9aaafde6d5 Fix: Pb with cache files for graphical boxes:
Missing year into cache id.
User with restrcited permission on thirdparty must not share same cache
files that "see all" users.
2014-01-31 18:48:57 +01:00
Laurent Destailleur
f50ad96beb Fix: var init at wrong place 2014-01-25 23:14:57 +01:00
Laurent Destailleur
1a35fb801a Fix: var init at wrong place 2014-01-25 23:14:25 +01:00
simnandez
a059b66b7d Fix: box of bank balances lines without decimals 2014-01-23 16:27:34 +01:00
simnandez
6fed307d70 Fix: box of bank balances lines without decimals 2014-01-23 16:26:07 +01:00
Laurent Destailleur
b5620d5f15 New: The box "balance of bank accounts" show all opened accounts. 2014-01-15 17:52:16 +01:00
Laurent Destailleur
6946fdbcda Merge remote-tracking branch 'origin/3.5' into develop 2013-12-16 00:09:29 +01:00
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00
Raphaël Doursenaud
071dd8e758 Make bookmarks module multicompany aware 2013-12-10 12:00:42 +01: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
06f36fbfab Fix: Bad permission check 2013-09-24 10:59:15 +02:00
Laurent Destailleur
fd564f5c7d Optimize cookie usage for boxes. Only 1 cookie per box, instead of 1
cookie
per
parameter.
2013-09-21 12:30:44 +02:00
Cédric Salvador
b21226f2b7 fixed fatal error 2013-09-12 16:39:18 +02:00
Laurent Destailleur
10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang
2013-09-04 15:13:38 +02:00
Laurent Destailleur
e40452f3b2 Fix: Bug if modules not enabled 2013-09-03 11:36:28 +02:00
Laurent Destailleur
1392f4e623 Merge pull request #1203 from PaulPoulain/966-develop
T966-develop : Put the poste of the contact in the list
2013-09-01 14:49:06 -07:00
simnandez
2a8aa50163 Fix: Intervention box links to contracts id
Conflicts:
	htdocs/core/boxes/box_ficheinter.php
2013-08-29 12:12:02 +02:00
simnandez
b86e20f0e6 Fix: Intervention box links to contracts id 2013-08-29 12:05:29 +02:00
lalaina rasamoelina
3156f8cae0 Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-29 09:30:26 +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
Laurent Destailleur
8c90ad8afa Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/modFacture.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
	htdocs/expedition/fiche.php
	htdocs/fourn/fiche.php
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bills.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/categories.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/ecm.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/exports.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/holiday.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mailmanspip.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/members.lang
	htdocs/langs/el_GR/opensurvey.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/oscommerce.lang
	htdocs/langs/el_GR/other.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/products.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/margin/productMargins.php
2013-08-24 22:41:32 +02:00
Laurent Destailleur
1c527b8db9 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-08-24 20:59:02 +02:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
Laurent Destailleur
ea4ac30b28 Fix: more responsive box 2013-08-21 21:39:39 +02:00
Laurent Destailleur
e460aa335c New: When there is no data on pie chart, can set color to an empty
value.
2013-08-20 11:51:24 +02:00
Grand Philippe
49e38e1263 fix some trad 2013-08-16 10:16:06 +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
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
85572a4bd1 New: Start to work on box for product distributions
Qual: Start to move code of dol_print_graph function into class
DolGraph.
2013-08-05 17:19:49 +02:00
Laurent Destailleur
a334b96469 Optimize screen size 2013-08-01 02:28:47 +02:00
Laurent Destailleur
57ce331833 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-30 17:23:13 +02:00
Laurent Destailleur
eeb8ef57c9 Fix: grip and close for title must differ from grip and close used for
other styles.
2013-07-30 17:22:52 +02:00
Laurent Destailleur
87713c49ac New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with
a vlue that is list name, separated by a coma, of other POST parameters,
Dolibarr will automatically save this parameters into user cookies.
New: Can select to see number or amount or both, for graph boxes.
2013-07-29 19:12:04 +02:00
Laurent Destailleur
99e5bf3120 New: Enhance graphical boxes. Prepare to show filters form to modify
graph.
2013-07-26 18:40:43 +02:00
Cédric Salvador
19dc3ef8da instanciation of Facture objects raised errors, deleted them 2013-07-22 11:51:29 +02:00
Laurent Destailleur
91b51f1f58 Fix: Some td cells must not have hover styles. 2013-07-19 15:52:49 +02:00
Laurent Destailleur
75214a6b70 New: Add graphical box for turnover and proposal 2013-07-18 16:53:31 +02:00
Laurent Destailleur
f564d1912e New: Add graph for supplier invoices.
Fix: Error management into supplier invoice validation.
2013-07-16 18:43:38 +02:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Laurent Destailleur
387c213aea New: Add box for graph of customer orders 2013-06-30 23:01:28 +02:00
Laurent Destailleur
4b00da5fa8 Work on boxes with graph 2013-06-29 02:23:23 +02:00
Laurent Destailleur
d8883dba7f New: Add new graphical boxes (customer invoices per month). 2013-06-28 19:19:18 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +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
1c8edb9cb5 Use currency symbol instead of text 2013-06-11 02:06:34 +02:00
Laurent Destailleur
319295554d Fix: Free memory after request 2013-06-08 00:52:02 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
cce857d6ee Fix: When box is removed, it is added into combo box of available boxes. 2013-04-25 01:35:33 +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
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
fhenry
ba0e9c0c19 Fix [ bug #843 ] Erreur SQL box_stock
fix [ bug #842 ] Erreur SQL Propal
2013-04-23 14:02:29 +02:00
Laurent Destailleur
bb3f40a1bf Qual: Clean code to be able to update combo box when removing a box.
Qual: Opensurvey tables
2013-04-19 15:26:53 +02:00
Laurent Destailleur
570e4391a5 Fix: Box with product out of stocks for pgsql 2013-04-19 14:51:39 +02:00
fhenry
4927aae891 [ task #741 ] Gestion des interventions/Add intervention box 2013-04-17 16:20:01 +02:00
Laurent Destailleur
64a9689473 Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on
payment
2013-04-07 14:41:42 +02:00
Laurent Destailleur
fafd426903 Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on
payment
2013-04-07 14:40:13 +02:00
Laurent Destailleur
a3c5db968e Merge pull request #800 from FHenry/develop
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-05 13:39:52 -07:00
Laurent Destailleur
ff4c9c495a Fix: Uniformize field names 2013-04-05 13:35:09 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
Laurent Destailleur
545ac638b0 Qual: Removed deprecated code for using a specific mobile theme.
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
2013-04-03 15:20:56 +02:00
Laurent Destailleur
aba9fd8fc5 Fix: Nowrap 2013-04-01 23:01:38 +02:00
Laurent Destailleur
29a1640b4c Qual: Normalize field ref_supplier into supplier invoices (replace
facnumber).
2013-04-01 22:39:27 +02:00
Regis Houssin
55757a6b82 Fix: $i is global 2013-03-27 20:42:55 +01:00
Laurent Destailleur
1e5c56642c Fix: Some regression after renaming state and lastname. 2013-03-08 02:49:42 +01:00
Laurent Destailleur
fd6b51413c Civility not required in a short label 2013-02-28 15:37:53 +01:00
Grand Philippe
c9f91a6082 english language standardization 2013-02-23 17:01:10 +01:00
Grand Philippe
ac0e99bc1a english language standardization 2013-02-23 16:21:49 +01:00
Grand Philippe
37cce5d860 fix: change name with lastname 2013-02-23 14:31:59 +01:00
Grand Philippe
d229d3a594 english standardization 2013-02-22 09:41:56 +01:00
simnandez
5d357c7736 Trad: Fix activity box translation 2013-02-21 18:48:56 +01:00
fhenry
82fc8e1536 Task 350 in Doliforge 2013-02-12 19:16:48 +01:00
Laurent Destailleur
a5b174eccc Fix: Architecture of getCurrency was wrong. Cache was not stored
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
2013-01-18 15:57:11 +01:00
Laurent Destailleur
591eab4826 Detect another problem into box. Just add a comment. 2013-01-18 14:22:18 +01:00
Laurent Destailleur
a12972034f Fix: Start to fix some bugs 2013-01-18 13:56:36 +01:00
Laurent Destailleur
0923102c4a Fix: Duplicate declaration 2013-01-16 16:53:47 +01:00
Laurent Destailleur
f1f7ff315f Fix: CRLF 2013-01-16 15:54:07 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +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
Laurent Destailleur
0b045a2d96 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/boxes/box_activity.php
	htdocs/filefunc.inc.php
2013-01-16 14:11:19 +01:00