Laurent Destailleur
d8a86453e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-04 21:15:16 +02:00
Laurent Destailleur
677fb46136
Optimize size of graph
2013-04-04 21:13:51 +02:00
fhenry
ef5c03fc99
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
2013-04-04 19:57:16 +02:00
Laurent Destailleur
607ebbfe8b
Qual: Replace tab with div
2013-04-04 19:42:21 +02:00
fhenry
c109467d20
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-04 13:58:33 +02:00
Laurent Destailleur
76910d4159
Look: Start to use div to render actions buttons
2013-04-03 18:37:54 +02:00
Laurent Destailleur
7f15154c6b
Qual: Uniformize skins code.
2013-04-03 15:45:06 +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
jfefe
cf6f4405cb
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
...
Conflicts:
htdocs/comm/propal.php
2013-04-01 19:44:55 +02:00
jfefe
a8874ebcc8
Uniformize usage of extrafields methods
2013-04-01 19:43:26 +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
3c23a717fd
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/core/lib/files.lib.php
2013-03-30 14:10:15 +01:00
Laurent Destailleur
e0baa0fe46
Generalize fix: file with a specific mask not found, again
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/expedition/fiche.php
htdocs/fichinter/fiche.php
2013-03-30 14:04:09 +01:00
Laurent Destailleur
a5e66ab7ba
Generalize fix: file with a specific mask not found, again
2013-03-30 13:54:46 +01:00
jfefe
e99ba51f1d
Use of new function to set optionals from add / update form
...
Format date display for data from JS calendar (date type extrafield)
2013-03-30 10:46:23 +01:00
jfefe
f3a7d497c6
Fix : missing object when calling function
2013-03-29 22:30:07 +01:00
jfefe
6c872395e3
Fix: syntax error
2013-03-29 22:26:25 +01:00
jfefe
649c1f3721
Try new function to set array_options to object (extrafields values) with date sent by forms
2013-03-29 22:25:02 +01:00
jfefe
6aae37493c
Add support of calendar on date type extrafield on propal
2013-03-29 22:14:06 +01:00
Regis Houssin
888da9f3e9
Fix: file with a specific mask not found
2013-03-29 11:52:18 +01:00
Laurent Destailleur
8ad801d0b6
Merge pull request #784 from jfefe/extra_error
...
Better error management when add/update extrafields
2013-03-28 11:12:58 -07:00
jfefe
013eac1147
Better error management when add/update extrafield
...
Usage of setEventMessage() function
2013-03-27 21:24:45 +01:00
jfefe
ee52e1a487
Merge remote-tracking branch 'upstream/develop' into propal_odt_choice
2013-03-27 15:25:13 +01:00
jfefe
47b6829e17
Remove DOS EOF (dos2unix utility used)
2013-03-27 14:39:41 +01:00
Laurent Destailleur
4fb4734eed
Merge pull request #772 from grandoc/develop
...
fix : trad error
2013-03-24 15:08:24 -07:00
Laurent Destailleur
85cafee19f
New: Add substitutions keys in view
2013-03-24 19:06:20 +01:00
Laurent Destailleur
b3d4811b6f
New: Another method to allow style tags into email.
...
Preivous one was using encoding, but this create data to not be stored
correctly into database. Old method is still available by adding
'_encoded' at end of toolbar name.
2013-03-24 19:00:58 +01:00
Grand Philippe
c5e742278e
fix : trad error
2013-03-24 07:11:44 +01:00
fhenry
8971e6fe15
[ task #710 ] Envoi de mail
2013-03-23 14:39:23 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Laurent Destailleur
2da3fb68a0
Merge pull request #751 from jfefe/extrasep
...
New type of extrafield : separator
2013-03-16 07:41:34 -07:00
Laurent Destailleur
55f9879a6c
Replace table with div. Prepare work for android application.
2013-03-16 14:53:15 +01:00
jfefe
71bb4149cc
New : Automatic creation of the document to the closing of the propale depending on the model selected in the configuration
2013-03-16 02:08:07 +01:00
jfefe
8a3fae31e1
When create a propal, select model document chosen by defaut in module config
2013-03-16 01:13:44 +01:00
jfefe
7a16e1b658
Show extrafield separator in propale
2013-03-15 23:41:24 +01:00
Laurent Destailleur
298ba17e8f
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/exports/class/export.class.php
htdocs/webservices/server_user.php
2013-03-15 01:10:56 +01:00
Laurent Destailleur
9729e83e66
Fix: Do not use deprecated function
...
New: ajax constant on off can be reversed
2013-03-13 23:05:34 +01:00
Laurent Destailleur
6fc57fb90d
Merge pull request #740 from FHenry/3.3
...
Fix syntax error
2013-03-13 08:52:25 -07:00
fhenry
d4621c3921
Fix syntax error
2013-03-13 10:15:37 +01:00
Laurent Destailleur
e1bf659db5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-11 16:49:37 +01:00
Laurent Destailleur
b0d7b33815
Merge pull request #715 from jfefe/extrafields
...
[ task #746 ] add extrafields support on propal object
2013-03-11 08:44:59 -07:00
Laurent Destailleur
5bc66318c2
New: use dolGetFirstLastname() everywher we should.
2013-03-11 15:54:01 +01:00
Laurent Destailleur
9eae775837
Merge remote-tracking branch 'origin/3.3' into develop
2013-03-11 14:35:08 +01:00
Laurent Destailleur
710ea872a9
Merge pull request #727 from cbattarel/3.3
...
fix wrong value name when updating buyingprice
2013-03-11 06:25:35 -07:00
Christophe Battarel
f620e6948f
fix wrong value name when updating buyingprice
2013-03-11 09:08:57 +01:00
jfefe
ba8525bd6a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields
...
Conflicts:
htdocs/install/doctemplates/invoices/template_invoice.odt
htdocs/install/doctemplates/proposals/template_proposal.odt
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-11 05:21:35 +01:00
Laurent Destailleur
746e005726
Fix: Fix ton of regression due to field name change
2013-03-09 20:34:38 +01:00
Laurent Destailleur
0fe91796ef
New: [ task #696 ] Remove "new stdClass();" when possible
2013-03-08 15:52:23 +01:00
Laurent Destailleur
e5f712fe14
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-08 12:09:49 +01:00