Marcos García de La Fuente
83b58aca89
Typo
2014-06-09 22:49:27 +02:00
Marcos García de La Fuente
0810e6756a
Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
2014-06-09 22:48:16 +02:00
Laurent Destailleur
c52a494fbe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-06-09 17:26:02 +02:00
Juanjo Menent
8ae2dfbf9e
Merge pull request #1646 from marcosgdf/develop
...
CR Fix
2014-06-09 16:18:25 +02:00
Laurent Destailleur
b124007c8c
Merge remote-tracking branch 'origin/3.5' into develop
2014-06-09 15:30:41 +02:00
Marcos García de La Fuente
9344123887
CR Fix
2014-06-09 15:25:31 +02:00
Laurent Destailleur
4c3c62515d
Fix: Confusion between is_int and is_numeric.
2014-06-09 15:21:20 +02:00
Laurent Destailleur
9ba4b53a88
Merge pull request #1645 from FHenry/3.5
...
Start fix [ bug #1437 ] Securitu Issue
2014-06-09 15:10:55 +02:00
Laurent Destailleur
803ccc300a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-06-09 14:59:09 +02:00
Laurent Destailleur
8d8ca154f1
Fix: For supplier order/invoice, deselect product when free line is
...
selected.
2014-06-09 14:58:58 +02:00
Florian HENRY
77a9d4eb71
Start fix [ bug #1437 ] Securitu Issue
...
Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple
I don't have magical solution for this kind of security issue
2014-06-09 12:34:10 +02:00
Francis Appels
1460a0b0f1
fix: remise_client history
2014-06-08 12:36:44 +02:00
Laurent Destailleur
918b44ac57
Merge pull request #1639 from Mainmich/patch-1
...
Update facture.php foreach wrong argument
2014-06-07 19:43:38 +02:00
Laurent Destailleur
dd521b45d0
Merge pull request #1642 from fmarcet/develop
...
Fix: Serious bug on withdrawal
2014-06-07 19:36:57 +02:00
fmarcet
66606b42ca
Fix: Serious bug on withdrawal
2014-06-06 17:06:30 +02:00
Laurent Destailleur
48cdd3c13f
Fix: extra fields key.
2014-06-06 16:08:42 +02:00
Laurent Destailleur
2ec4c56f6b
Merge pull request #1640 from FHenry/3.5
...
3.5
2014-06-06 15:34:57 +02:00
Laurent Destailleur
768163c6fc
Fix: Easy fix to solve pb with pagebreak when adding image
2014-06-06 12:57:12 +02:00
Laurent Destailleur
171227e43a
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2014-06-06 12:00:21 +02:00
Laurent Destailleur
905f700136
Fix: Pb with pagebreak when adding image
2014-06-06 11:57:45 +02:00
Laurent Destailleur
c45aace9b9
Add easy fix to solve pb of links for some modules.
2014-06-05 23:30:20 +02:00
Laurent Destailleur
03ca7e6b63
Fix: Missing global
2014-06-05 22:42:49 +02:00
Florian HENRY
ebe49b0525
Same bug, missing select column use in result
2014-06-05 10:58:38 +02:00
Florian HENRY
e8f8644bf4
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-06-05 10:53:20 +02:00
Florian HENRY
44a1059158
Fix warining message during societe activation
2014-06-05 10:53:00 +02:00
Mainmich
bc0c0eeddb
Update facture.php foreach wrong argument
...
Wrong array in foreach line 503.
2014-06-04 19:13:58 +02:00
Laurent Destailleur
6029818be6
Merge pull request #1638 from marcosgdf/bug-1434
...
Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text
2014-06-03 23:44:55 +02:00
Laurent Destailleur
1dc3412bbd
Merge pull request #1636 from marcosgdf/cp-1380
...
Fix: [ bug #1380 ] Customer invoices are not grouped in company results report (cherry picked from commit bd061f4
2014-06-03 23:43:58 +02:00
Laurent Destailleur
9254f06847
Merge pull request #1637 from aspangaro/develop
...
Salaries :: Missing key language & typo
2014-06-03 23:43:23 +02:00
Marcos García de La Fuente
4c11e37203
Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text
2014-06-03 15:45:03 +02:00
aspangaro
bb4fed30a8
Salaries :: Missing key language & typo
2014-06-03 06:45:37 +02:00
Laurent Destailleur
fc2bd4ab4e
Fix: [ bug #1380 ] Customer invoices are not grouped in company results
...
report
(cherry picked from commit bd061f4
2014-06-02 02:16:49 +02:00
Laurent Destailleur
c1431bdf93
Fix: Typo
2014-05-31 14:22:19 +02:00
Laurent Destailleur
de10b16090
Fix: restore fa_IR integrity
2014-05-31 14:22:05 +02:00
Laurent Destailleur
cbd080f6cb
Fix: Typo
2014-05-31 14:02:36 +02:00
Laurent Destailleur
883290a7b0
Add es_DO
2014-05-31 01:49:48 +02:00
aspangaro
27f0cbdb83
Merge branch 'Upstream/develop'
2014-05-30 21:01:01 +02:00
Laurent Destailleur
39c1064261
Fix: Process only .lang files.
2014-05-30 18:30:24 +02:00
Laurent Destailleur
33d2e867dd
Keep only delta for pt_BR
2014-05-30 18:26:33 +02:00
Laurent Destailleur
354ceddb87
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/contracts.lang
htdocs/langs/es_ES/exports.lang
htdocs/langs/es_ES/mails.lang
htdocs/langs/es_ES/main.lang
htdocs/langs/es_ES/products.lang
htdocs/langs/es_ES/stocks.lang
2014-05-30 18:17:52 +02:00
Juanjo Menent
8e3f36e9cc
Trad: Update es_ES from transifex
2014-05-30 16:48:41 +02:00
Laurent Destailleur
d219916f0a
Transifex sync
2014-05-30 16:47:24 +02:00
Laurent Destailleur
e1fc9bee6b
Fix: Removed deprecated test
2014-05-30 13:41:58 +02:00
Laurent Destailleur
6b6261a803
Fix: Use last name and not name.
2014-05-30 13:34:51 +02:00
Laurent Destailleur
4a96fd0d77
Fix: No error once multicompany module has been removed.
2014-05-30 13:08:01 +02:00
Laurent Destailleur
efd9337c9f
Fix: Hierarchy view with multicompany
2014-05-30 12:55:00 +02:00
Laurent Destailleur
449678d687
Fix: get_full_tree must follow same filter rule thant list of users
2014-05-30 12:43:07 +02:00
Laurent Destailleur
3c4dfba99e
Fix: Filter on status
2014-05-30 12:32:19 +02:00
Laurent Destailleur
bc7621b92e
Merge remote-tracking branch 'origin/3.5' into develop
2014-05-30 11:46:47 +02:00
Laurent Destailleur
584027dd05
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-05-30 11:46:34 +02:00
