Grand Philippe
f25ddfbc9c
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
2014-04-07 10:03:01 +02:00
Grand Philippe
42b6628b76
translation and cleaning
2014-04-07 09:54:24 +02:00
Laurent Destailleur
6f47e2e154
Ignore file
2014-04-06 21:25:53 +02:00
Laurent Destailleur
3bc63c43dc
Fix: [ bug #1322 ] notification d'erreur en insérant ou supprimer un
...
tiers dans une catégorie
2014-04-06 21:25:26 +02:00
Laurent Destailleur
41a2ce1a74
Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales
...
Conflicts:
htdocs/comm/propal.php
2014-04-06 21:21:08 +02:00
Laurent Destailleur
90f5f0823f
Prepare 3.5.2
2014-04-05 16:32:25 +02:00
Laurent Destailleur
c57c3aef84
Fix: Missing return
2014-04-05 16:28:09 +02:00
Laurent Destailleur
174d4f6ff2
Prepare 3.5.2
2014-04-05 16:15:04 +02:00
Laurent Destailleur
da0aebb2e9
Fix: Can't add user
2014-04-05 12:40:24 +02:00
Laurent Destailleur
63729ab508
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-04-02 19:35:04 +02:00
Laurent Destailleur
ebb9016ad5
Fix: missing 'ifone' into param
2014-04-02 19:34:42 +02:00
Laurent Destailleur
d5448f9ca4
Merge pull request #1521 from FHenry/3.5
...
Extrafield select form table do not display selected value on edit mode
2014-04-02 14:57:00 +02:00
Laurent Destailleur
cf8ff97855
Fix: Install of odt templates for project and tasks failed.
2014-04-02 13:17:20 +02:00
Laurent Destailleur
d5986caed2
Fix: [ bug #1318 ] Problem with enter key when adding an existing
...
product to a customer invoice.
2014-04-02 12:00:01 +02:00
Laurent Destailleur
918fe5dbb5
Fix: [ bug #1318 ] Problem with enter key when adding an existing
...
product to a customer invoice
2014-04-02 11:58:59 +02:00
Laurent Destailleur
f3bbf54447
Fix: [ bug #1307 ] Quotes get removed from several inputs
2014-04-02 11:52:09 +02:00
Florian Henry
a2a46f9300
Extrafield select form table do not display selected value on edit mode
2014-04-02 11:34:15 +02:00
Laurent Destailleur
46e46507ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/comm/action/index.php
htdocs/compta/bank/class/account.class.php
htdocs/compta/bank/index.php
2014-04-02 11:33:47 +02:00
Laurent Destailleur
8cb06cac08
FIX : [ bug #1317 ] Removing a category does not remove all child
...
categories
2014-04-02 11:27:11 +02:00
Cedric
a4797a0e4a
FIX : [ bug #1317 ] Removing a category does not remove all child categories
2014-04-02 11:25:17 +02:00
Laurent Destailleur
663a3bd45c
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-04-02 11:21:11 +02:00
Laurent Destailleur
c421613da9
Merge pull request #1520 from KreizIT/fix_1317
...
FIX : [ bug #1317 ] Removing a category does not remove all child categories
2014-04-02 11:20:47 +02:00
Laurent Destailleur
ab6a67054a
Merge pull request #1516 from marcosgdf/multicompany-fixes
...
Fixed a problem with bank accounts sharing across entities
2014-04-02 11:16:48 +02:00
Laurent Destailleur
48c77d2ceb
Fix: [ bug #1312 ] Call to undefined function _()
2014-04-02 10:48:20 +02:00
Laurent Destailleur
6dab09e07a
Fix: Bad dialog position
2014-04-02 00:04:13 +02:00
Cedric
df5a009aa2
FIX : [ bug #1317 ] Removing a category does not remove all child categories
2014-04-01 16:21:20 +02:00
Laurent Destailleur
c969bc3e93
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-04-01 09:13:34 +02:00
Laurent Destailleur
f1466e64af
Fix: Build for obs
2014-04-01 09:12:49 +02:00
Laurent Destailleur
1fad693867
Fix: Removed useless strtolower
2014-03-31 02:25:35 +02:00
Laurent Destailleur
ed49f88446
Fix: deleting files into backup system tools.
...
Fix: Dump using php not not include lock on tables that are deleted.
2014-03-31 00:19:31 +02:00
Marcos García de La Fuente
e6bd3921f1
Fixed a problem with bank accounts sharing across entities
2014-03-30 23:00:35 +02:00
Laurent Destailleur
95793a5475
Fix: fields into group by of sql requests for module margins must be
...
same than fields into select.
2014-03-30 16:08:30 +02:00
Laurent Destailleur
c506e59d8c
Look: Minor fix to not have calendar picto to glue to input
2014-03-30 15:58:41 +02:00
Laurent Destailleur
a5c2b78565
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-29 17:38:06 +01:00
Laurent Destailleur
61f649e1ae
Fix: When select_date is called with '' as preselected date,
...
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
2014-03-29 04:26:44 +01:00
Juanjo Menent
acb752c5f2
Fix: Margin tabs bad data show
2014-03-28 18:22:44 +01:00
Laurent Destailleur
832ebb1cfe
Merge pull request #1512 from atm-alexis/3.5
...
fix can't add line with product in supplier order
2014-03-27 16:05:38 +01:00
Laurent Destailleur
f282ffc549
Merge pull request #1508 from KreizIT/3.5
...
FIX :[bug #1309 ]
2014-03-27 15:58:13 +01:00
Laurent Destailleur
ae728645d6
Merge pull request #1504 from marcosgdf/multicompany-fixes
...
Fix: Agenda and Banks module were not working with multicompany module
2014-03-27 15:31:54 +01:00
Laurent Destailleur
c6b700d449
Merge pull request #1502 from FHenry/3.5
...
Fix restrictedearea bug & delete extrafield on delete invoice
2014-03-27 15:30:15 +01:00
Alexis Algoud
f97c8feb54
fix can't add line with product in supplier order
2014-03-26 11:28:41 +01:00
Florian Henry
3d12979b3f
remove debug string
2014-03-26 09:53:48 +01:00
Cedric
57cf384617
Keep value on validtions failure
2014-03-25 13:05:29 +01:00
Cedric
e16385b496
FIX :[bug #1309 ]
2014-03-25 11:48:44 +01:00
Florian Henry
bb07d7f814
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-03-24 13:25:35 +01:00
Laurent Destailleur
f115501ddf
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-24 00:16:47 +01:00
Laurent Destailleur
3f78fe8c93
Fix: Avoid to get duplicate field
2014-03-23 21:01:05 +01:00
Laurent Destailleur
6039c81845
Fix: copy to clipboard does not work with jmobile
...
Fix: Bad translation
2014-03-23 20:56:41 +01:00
Laurent Destailleur
57bd043f59
Fix: Missing lang loading
2014-03-23 20:30:54 +01:00
Laurent Destailleur
466de67b5b
Fix: Solve pb of too many embedded tables
2014-03-23 20:18:07 +01:00
