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
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
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
