Laurent Destailleur
f3adcc311d
Qual: Removed useless table
2013-04-10 18:34:19 +02:00
Laurent Destailleur
a32a02e4c1
Fix: Removed warnings
2013-04-10 16:51:13 +02:00
Laurent Destailleur
b496436fe3
Qual: Reduce number of methods. Mutualize update_note code.
2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
Laurent Destailleur
88858136fc
New: Enhance agenda module to reach RFC2445 (add busy information).
2013-04-06 17:39:31 +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
Laurent Destailleur
815bb82b0e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-05 22:51:19 +02:00
Laurent Destailleur
c10f2dd327
Merge pull request #807 from FHenry/3.3_bug794
...
Fix [ bug #794 ] Lost filter on zipwode in prospect list
2013-04-05 13:50:27 -07:00
Laurent Destailleur
b47765f721
Optimize for smartphones
2013-04-05 22:26:41 +02:00
fhenry
09d1e56ca5
Fix [ bug #794 ] Lost filter on zipwode in prospect list
2013-04-05 13:01:15 +02:00
fhenry
dcd960a957
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9
2013-04-05 11:46:09 +02:00
fhenry
81b34f9918
Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page
...
mail
2013-04-05 09:23:31 +02:00
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
Laurent Destailleur
2a67af3c94
New: when adding an action, we can define a free code to tag it for
...
a specific need.
2013-03-08 12:04:01 +01:00
Laurent Destailleur
a6ce7bb428
Fix: Regression for negative proposal lines.
...
Conflicts:
htdocs/comm/propal.php
2013-03-08 10:28:25 +01:00
Laurent Destailleur
ffa2c2fb58
Oops, bad fix
2013-03-08 10:22:30 +01:00
Laurent Destailleur
f041a8a95e
Fix: Regression for negative proposal lines.
2013-03-08 10:06:23 +01:00
jfefe
7d3c35fb90
Merge branch 'extra_propal' into extrafields
2013-03-06 01:41:47 +01:00
jfefe
8b749eaafc
Fix : extrafields are not saved on update (propale)
2013-03-06 01:34:32 +01:00
jfefe
61127e82f6
User must have write permission to edit extrafields on propale
2013-03-06 01:33:55 +01:00
jfefe
9eee5f9509
Fix : extrafields for propale were note saved after creation
2013-03-06 00:18:41 +01:00
jfefe
3cefb62621
Fix : incorrect function used to retrieve extrafields for propal
2013-03-05 22:22:10 +01:00
Laurent Destailleur
c37e873ab4
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
2013-03-05 18:32:01 +01:00
jfefe
59627408c0
Edit extrafields on propal
2013-03-04 19:17:11 +01:00
jfefe
f335c4f306
New : add extrafield support on propal object
2013-03-04 18:22:25 +01:00
fhenry
f793ed83f6
Fix [ bug #747 ]
2013-03-04 15:36:40 +01:00
Laurent Destailleur
931b556b69
Fix: sql error
2013-03-04 00:01:38 +01:00
simnandez
7d9d575e40
[ task #731 ] Uniformize ref generation. Propals
2013-03-02 15:57:26 +01:00
Laurent Destailleur
911c25c3fd
Qual: Better error management
2013-03-01 19:25:49 +01:00
Laurent Destailleur
b9848702a8
Merge remote-tracking branch 'origin/3.3' into develop
2013-02-27 19:44:22 +01:00
Laurent Destailleur
d190e924b3
Fix: Update of type was not working.
2013-02-27 19:43:40 +01:00
Laurent Destailleur
8b244b0d61
Fix: select lost if error
2013-02-27 19:21:40 +01:00
Grand Philippe
44683a0e21
english language standardization
2013-02-27 11:58:50 +01:00
Laurent Destailleur
402fe2e417
Merge remote-tracking branch 'origin/3.3' into develop
2013-02-26 20:05:23 +01:00
Grand Philippe
79c2e17cbb
english language standardization
2013-02-25 17:56:41 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847
english language standardization
2013-02-25 09:17:38 +01:00
Grand Philippe
86de772b31
english language standardization
2013-02-24 17:08:52 +01:00
Grand Philippe
6adc9eb7f2
english language standardization
2013-02-23 17:40:28 +01:00
Grand Philippe
c9f91a6082
english language standardization
2013-02-23 17:01:10 +01:00
Grand Philippe
a237be0d24
english language standardization
2013-02-23 15:26:39 +01:00
Grand Philippe
7c2a4500d6
fix: change name with lastname
2013-02-23 12:30:01 +01:00
Grand Philippe
38480f5962
english standardization
2013-02-22 16:19:16 +01:00
Grand Philippe
a582fd3f15
english standardization
2013-02-22 16:14:52 +01:00
fhenry
44b5b98308
Fix [ bug #733 ]
2013-02-22 15:02:06 +01:00
Grand Philippe
0af5c434af
english standardization
2013-02-22 09:29:34 +01:00
eldy
4f1c4f0365
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-22 00:11:47 +01:00
eldy
e99b0dd96f
Fix: Select prospect, customer or both
2013-02-21 21:11:21 +01:00
simnandez
c03f346c6d
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2013-02-21 10:12:05 +01:00
Laurent Destailleur
66ca0ba0e2
Fix: alignement
2013-02-20 21:58:13 +01:00
Laurent Destailleur
3687b29a7b
Fix: Missing translation
2013-02-20 21:42:20 +01:00
Laurent Destailleur
af26c4ce6d
Fix: Missing translation
2013-02-20 21:41:50 +01:00
simnandez
b913d186bd
Qual: Try to delete no more used addpropal.php
2013-02-20 18:32:14 +01:00
Laurent Destailleur
7367a2472c
Look: Mor CSS3
2013-02-19 13:24:32 +01:00
Laurent Destailleur
b21cb5b899
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture.php
htdocs/filefunc.inc.php
2013-02-17 17:25:38 +01:00
Laurent Destailleur
aa8413d7cb
Fix: Missing migration
...
Fix: Error management
2013-02-17 16:20:49 +01:00
Laurent Destailleur
4dca883f21
Merge pull request #655 from FHenry/develop
...
Task 714 and Fix bug on task 350
2013-02-16 14:16:08 -08:00
Laurent Destailleur
2ea62073b6
Merge pull request #660 from grandoc/develop
...
fix : doesn't work with a /
2013-02-16 14:14:30 -08:00
Grand Philippe
785e72d533
fix trad : change adresse versus address
2013-02-15 19:36:09 +01:00
Laurent Destailleur
e0bbb78f56
Fix: Merge customer and prospect tab
2013-02-15 17:28:07 +01:00
Laurent Destailleur
bbb18b3175
Look: More CSS3
2013-02-15 10:42:35 +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
f043fcfaf7
Fix bug [ bug #709 ]
2013-02-14 13:55:05 +01:00
fhenry
136dc651f3
Merge branch 'develop' into develop_merger_cust_prospect_tab
2013-02-12 19:18:15 +01:00
fhenry
82fc8e1536
Task 350 in Doliforge
2013-02-12 19:16:48 +01:00
Laurent Destailleur
3eb485d521
Qual: Removed TODO, deprecated code and deprecated properties. This also
...
fix missing combo box of contacts onto CC.
2013-02-12 17:08:21 +01:00
fhenry
6ad617842d
Commit temporaire
2013-02-12 15:31:12 +01:00
Laurent Destailleur
6bbac00c22
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/user/fiche.php
2013-02-12 15:17:22 +01:00
Laurent Destailleur
ddf27b2c67
Fix Bug 708
2013-02-12 15:01:16 +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
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +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
simnandez
ad3645f7f4
Fix: [ bug #698 ] Bad calculation of totals of associated documents
2013-01-25 11:37:30 +01:00
simnandez
03d6903248
Fix: [ bug #698 ] Bad calculation of totals of associated documents
2013-01-24 12:53:42 +01:00
Regis Houssin
e8ce9cecf2
Fix: broken features, special_code also used by externals modules !
2013-01-22 21:36:30 +01:00
Regis Houssin
06a0da990b
Fix: broken features, special_code also used by externals modules !
2013-01-22 21:35:15 +01:00
Laurent Destailleur
abb6daf2dc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
3551dff18a
Fix: [ bug #671 ] Product country origin is automatically entered in
...
description of invoices, but not in invoices generated from orders
2013-01-19 15:57:28 +01:00
Laurent Destailleur
0e13b3872d
Fix: Removed warnings
2013-01-19 14:32:37 +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
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
fhenry
ff06b05b3d
Fix Bug [ bug #681 ] Can't modify a line a business proposal
2013-01-15 23:04:42 +01:00
Laurent Destailleur
29e6d01e51
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
fhenry
e369d5dfd8
Fix [ bug #668 ] Event created with a profile is not visible by the same
...
profile
2013-01-09 20:34:36 +01:00
Regis Houssin
a7ed40b10d
Fix: empty value if combobox disabled
2013-01-09 10:43:21 +01:00
Regis Houssin
a278ae7371
Fix: empty value if combobox disabled
2013-01-09 10:40:36 +01:00
Laurent Destailleur
0889bdc3eb
Fix: Error using static method
2013-01-07 23:20:00 +01:00
Laurent Destailleur
091e469050
Fix: [ bug #622 ] attaching wrong file when sending the invoice via
...
e-mail
2013-01-07 00:40:18 +01:00
Laurent Destailleur
96416735df
Fix: [ bug #618 ] External accounts can access confidential informations
...
(a lot)
2013-01-02 18:43:59 +01:00
Laurent Destailleur
cd6e3464db
Fix: Several fixes for bad management of external/internal users.
2013-01-02 14:35:16 +01:00
Laurent Destailleur
dbdc4e6ce8
Fix: Normalize option names
2012-12-31 13:40:13 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
201829e60c
Fix:[ bug #653 ] Error while creating additional attributes
2012-12-30 13:49:37 +01:00
Marcos García
4af2a4f875
Improved agenda translations
2012-12-29 02:21:00 +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
Laurent Destailleur
3aa9c75b0d
Fix: If thirdparty module not enabled, company and contact fields must
...
not be visibles
2012-12-21 17:56:40 +01:00
Laurent Destailleur
bcd2fead3d
Fix: patch from forum "User permissions on modAgenda"
2012-12-20 17:07:15 +01:00
