arnaud
85a58f666a
FIX product link in project box
2015-11-18 17:22:53 +01:00
Laurent Destailleur
388748055a
Fix missing translation for VAT
2015-11-15 15:08:54 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
fmarcet
310ecb1e09
FIX: Show product image on getNomUrl()
2015-10-29 12:28:28 +01:00
Laurent Destailleur
76ded0acea
Fix using DATE_FORMAT is forbidden
2015-10-27 19:26:33 +01:00
Laurent Destailleur
1b8234d9fe
Bette behaviour for blind people
2015-10-25 11:09:50 +01:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
e3f225e038
FIX bad link into project box
2015-10-05 19:41:41 +02:00
Laurent Destailleur
72d7671a1e
Enhance CSS
2015-09-22 16:21:46 +02:00
Laurent Destailleur
615734012e
Merge pull request #3476 from marcosgdf/refactor
...
Refactor: Created hasDelay functions
2015-09-09 20:50:58 +02:00
Marcos García de La Fuente
9ce8024f1e
Merge remote-tracking branch 'upstream/develop' into refactor
2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
47e62f2270
Created FactureFournisseur::hasDelay function
2015-09-06 18:47:26 +02:00
Marcos García de La Fuente
3c5159f497
Created Facture::hasDelay function
2015-09-05 10:56:13 +02:00
Laurent Destailleur
d19ec89bf1
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/modules/modHoliday.class.php
htdocs/holiday/card.php
2015-09-03 23:27:47 +02:00
Marcos García de La Fuente
ded6e7d6d9
Merge branch '3.7' into bug-3358
...
# Conflicts:
# ChangeLog
2015-09-03 12:32:03 +02:00
Laurent Destailleur
19ac160696
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_prospect.php
htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.z
htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmono.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
2015-09-03 10:49:41 +02:00
Laurent Destailleur
d64a87d980
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/index.php
2015-09-03 10:44:40 +02:00
Laurent Destailleur
001f1b4c31
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-03 10:41:44 +02:00
Marcos García de La Fuente
216827b1d8
FIX [ bug #3358 ] Tasks box does not work with PostgreSQL
...
Close #358
2015-09-01 11:26:59 +02:00
Raphaël Doursenaud
51d5bff15d
Fix #3442 Remove useless syslog
...
Not having the permission to read the box is not an error.
Furthermore, no other boxes have this behavior.
2015-08-31 19:41:42 +02:00
Laurent Destailleur
5f30ad3b63
Fix no link to show if id empty
2015-08-19 18:27:12 +02:00
Juanjo Menent
b2f5ae7aa8
Merge remote-tracking branch 'origin/3.7' into 3.8
...
# Conflicts:
# htdocs/core/boxes/box_task.php
2015-08-10 11:09:22 +02:00
Marcos García de La Fuente
cccc543065
Fix: [ bug #3288 ] Tasks box is not properly drawn
...
Close #3288
2015-08-09 13:16:55 +02:00
Juanjo Menent
efde88d211
Merge pull request #3247 from aspangaro/3.8-patch4
...
Fix: [Homepage] colspan problem with tasks box
2015-07-17 19:13:44 +02:00
aspangaro
f970494d1e
Fix: [Homepage] colspan problem with tasks box
2015-07-16 21:29:15 +02:00
aspangaro
3b547c0979
Fix : #3244 [Homepage] Last n members link broken
2015-07-16 21:17:31 +02:00
Laurent Destailleur
581b6d0001
Fix: missing status on contacts
2015-07-14 11:51:27 +02:00
Laurent Destailleur
8eb4a208ce
Debug statistics of project module
2015-07-05 22:04:30 +02:00
Laurent Destailleur
dc050d39eb
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
Laurent Destailleur
c218843cdb
FIX Save of filters into export profiles failed.
2015-06-24 18:29:29 +02:00
Laurent Léonard
ba64486e68
Remove useless filter for "text" parameter of boxes content
...
This filter doesn't allow to display "0" value and is not applied to the similar "text2" parameter.
2015-06-22 02:53:28 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +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
f84ea6f960
Uniformize code of boxes
2015-05-04 13:10:45 +02:00
Laurent Destailleur
e73526b29c
Fix prospect box must use the getNomUrl method
2015-05-04 12:42:45 +02:00
Laurent Destailleur
bce952fa9b
Fix bad link
2015-04-21 17:06:13 +02:00
Juanjo Menent
dc74302985
Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated
2015-04-18 11:32:01 +02:00
Laurent Destailleur
15531a7ebc
Better title for some boxes
2015-04-10 11:50:57 +02:00
Frédéric FRANCE
5a17a51212
Update box_actions.php
2015-04-02 18:11:30 +02:00
Laurent Destailleur
3844d4e6f7
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
htdocs/core/boxes/box_activity.php
htdocs/fourn/commande/card.php
htdocs/user/card.php
2015-03-23 15:16:37 +01:00
Laurent Destailleur
b7a466c95f
Fix bad style for total
2015-03-23 13:50:14 +01:00
Laurent Destailleur
17dc76838e
Fix bad url
2015-03-22 15:25:57 +01:00
Laurent Destailleur
c700d8a8ec
Fix remove warning
2015-03-17 11:59:44 +01:00
frederic34
f69e58cccb
Tooltip
2015-02-02 21:09:30 +01:00
frederic34
482eec1cce
Merge remote branch 'upstream/develop' into tooltip
2015-02-02 13:48:39 +01:00
Laurent Destailleur
9c087e27d0
Fix permissions
2015-02-02 13:45:55 +01:00
frederic34
3206957b99
Tooltip
2015-02-01 20:58:57 +01:00
Laurent Destailleur
d66d4f53a5
Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into
...
frederic34-tooltip
Conflicts:
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/product/index.php
2015-01-31 15:41:33 +01:00
Laurent Destailleur
1c7feb67ea
Merge branch 'dinamic-prices-product' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/fournisseurs.php
2015-01-31 14:53:14 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
frederic34
925aa2039b
Tooltip and cache for boxes
2015-01-23 10:51:12 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
73fda2cb86
WIP PSR2
2015-01-08 18:36:03 +01:00
Ion Agorria
5bbcb58b44
Added expressions for product/service prices
2014-12-28 01:26:41 +01:00
Marcos García de La Fuente
ee1bc22e79
Fix: [ bug #1722 ] Missing link in homepage project's box
2014-12-24 14:42:47 +01:00
Marcos García de La Fuente
034455fc2d
Fix: [ bug #1722 ] Missing link in homepage project's box
2014-12-23 16:37:53 +01:00
Laurent Destailleur
2c01a46774
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/paypal/lib/paypal.lib.php
2014-12-18 10:13:25 +01:00
aspangaro
666e66e78f
Correct link in activity box
2014-12-09 05:04:12 +01:00
Laurent Destailleur
a5bdf952ee
Fix: PHPCS
2014-12-05 17:44:47 +01:00
Laurent Destailleur
ae6f458a98
Merge pull request #2092 from frederic34/patch-2
...
Fix Typo
2014-11-28 00:12:11 +01:00
Laurent Destailleur
02d53aa26f
Merge pull request #2093 from frederic34/patch-4
...
Fix Typo
2014-11-28 00:11:49 +01:00
Laurent Destailleur
b21171303a
Merge pull request #2094 from frederic34/patch-5
...
Fix Typo
2014-11-28 00:11:23 +01:00
Laurent Destailleur
631a98c322
Merge pull request #2095 from frederic34/patch-6
...
Fix Typo
2014-11-28 00:10:48 +01:00
Laurent Destailleur
61889d2195
Merge pull request #2096 from frederic34/patch-7
...
Fix Typo
2014-11-28 00:10:24 +01:00
Frédéric FRANCE
90b582b1f3
Fix 1733 Homepage boxes close button translation error
...
In french : Close -> Clotûrer (Close a propal)
Close2 ->Fermer (Close a window)
2014-11-26 16:58:54 +01:00
Frédéric FRANCE
911f9c0913
Fix Typo
2014-11-25 01:13:52 +01:00
Frédéric FRANCE
e4517ee0f4
Fix Typo
2014-11-25 01:07:45 +01:00
Frédéric FRANCE
9fb58e06f6
Fix Typo
2014-11-25 01:06:55 +01:00
Frédéric FRANCE
6163635d7c
Fix Typo
2014-11-25 01:06:04 +01:00
Frédéric FRANCE
9d813b25d9
Fix Typo
2014-11-25 01:05:01 +01:00
Laurent Destailleur
671243e8f6
Fixed: Bugs reported by scrutinizer
...
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
Laurent Destailleur
2b8abf2794
Fix: Missing label
2014-11-02 20:07:38 +01:00
Laurent Destailleur
0abeea059e
Uniformize and clean boxes behaviour and translation.
2014-10-27 21:48:28 +01:00
Laurent Destailleur
4a60d57544
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/product/fiche.php
htdocs/product/liste.php
2014-10-18 21:08:09 +02:00
Laurent Destailleur
f498921715
Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into
...
GPCsolutions-droposcommerce
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/vi_VN/admin.lang
htdocs/langs/vi_VN/shop.lang
2014-10-13 00:50:51 +02:00
Laurent Destailleur
30e27014b8
Fix: box of customer and propsects were not correctly disabled.
2014-10-12 15:49:14 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Raphaël Doursenaud
f01e76f686
Removed unmaintaned OScommerce module
2014-09-29 15:22:48 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
Laurent Destailleur
013023204f
Merge pull request #1841 from GPCsolutions/modules
...
Modules classes documentation enhancements
2014-08-28 11:58:13 +02:00
Raphaël Doursenaud
2c1e892efe
Enhanced boxes model documentation
2014-08-21 18:35:34 +02:00
aspangaro
f774ff487b
Merge branch 'Upstream/develop'
2014-08-18 11:56:49 +02:00
Laurent Destailleur
b8b56e2d26
Fix: col balance
2014-08-14 13:25:54 +02:00
aspangaro
1a87d98357
Qual: Renamed table llx_c_civilite into llx_c_civility
...
field civilite into label in the same table and field civilite into civility in other table
2014-08-12 06:03:27 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
Laurent Destailleur
202774de0b
Merge pull request #1791 from frederic34/patch-graphbox
...
External user must not have graph box with all stats
2014-07-31 17:51:31 +02:00
Laurent Destailleur
8e5cbb1f6c
Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into
...
marcosgdf-patch-2
Conflicts:
test/phpunit/Functions2LibTest.php
2014-07-31 17:21:46 +02:00
frederic34
50e3049fd7
External user must not have graph box with all stats
2014-07-30 17:10:08 +02:00
Marcos García de La Fuente
1c97b3f779
Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode
2014-07-30 15:47:19 +02:00
Marcos García de La Fuente
972d3c69b6
Removed duplicated requires.
...
Json.lib.php is included with functions.lib.php
2014-07-30 15:42:58 +02:00
Laurent Destailleur
0f9aa69e4e
Fix: New: Differentiate text and img for better accessibility.
2014-07-29 21:34:23 +02:00
Laurent Destailleur
b57371bfa1
Fix: New: Differentiate text and img for better accessibility.
2014-07-29 20:21:01 +02:00
Laurent Destailleur
c895c892a5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Destailleur
c9d27383a4
Fix: When option to use optimize display for text borwser and blin
...
person is on, box addon was broken.
2014-07-29 00:50:57 +02:00
frederic34
a771f34c96
Update box_activity.php
...
$totalnb is not an amount
2014-07-27 11:27:33 +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
BENKE Charles
bbe400e01f
Update box_actions.php
...
Add popup action feature on homepage
2014-07-11 14:21:36 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
BENKE Charles
b34947b37c
fix travis error
2014-06-21 00:08:13 +02:00
BENKE Charles
496379ced8
fix travis error
2014-06-20 23:56:03 +02:00
BENKE Charles
24e780cb0c
Update box_task.php
2014-06-20 23:39:43 +02:00
BENKE Charles
a31d5cc193
Update box_project.php
2014-06-20 23:38:15 +02:00
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