lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,909 Commits 43 Branches 150 Tags 886 MiB
3.2.0
Commit Graph

27421 Commits

Author SHA1 Message Date
Laurent Destailleur
f67636d0f3 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-30 12:47:58 +02:00
Laurent Destailleur
92fe8ebe1d Fix: js not escaped 2012-05-30 12:33:47 +02:00
Regis Houssin
1a969e61e9 Fix: can't delete a files with quote 2012-05-30 08:31:59 +02:00
Laurent Destailleur
fd9565934c A better fix to remove files from document list 2012-05-30 04:11:37 +02:00
Laurent Destailleur
a465814fd4 More fix for canvas features 
Conflicts:
	htdocs/product/canvas/product/tpl/card_create.tpl.php
	htdocs/product/fiche.php
 2012-05-30 03:50:53 +02:00
Laurent Destailleur
514babeab1 Fix: delete of documents is done by page of element, not by the view 
wrapper.

Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/projet/fiche.php
 2012-05-30 00:18:11 +02:00
Regis Houssin
caadf396e2 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-30 00:09:49 +02:00
Regis Houssin
5c2922a17b Fix: big problem with files upload and more compatible with external 
modules

Conflicts:
	htdocs/compta/facture.php
 2012-05-30 00:09:38 +02:00
Laurent Destailleur
1618ce29c7 Fix: Return empty image instead of error when file not found. 2012-05-30 00:06:44 +02:00
Laurent Destailleur
f11430dec8 Removed deprecated strings 2012-05-29 22:22:00 +02:00
Laurent Destailleur
ea51673ce7 Update de_de translation (manual translation) 2012-05-29 22:19:02 +02:00
Laurent Destailleur
d9d32bb9f5 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-29 22:18:45 +02:00
Regis Houssin
1cbd628971 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-29 09:56:20 +02:00
Regis Houssin
46ae38c86d Fix: clone object before all treatment 2012-05-29 09:56:05 +02:00
Laurent Destailleur
b6c9a37415 Fix: Avoid to have a special php module. 2012-05-28 23:06:32 +02:00
Laurent Destailleur
79cafb1c12 Fix: Subscription must use company name when type is "moral" 2012-05-28 22:14:00 +02:00
Regis Houssin
21d30c1b3e Fix: jquery fileupload broken feature 2012-05-25 20:54:45 +02:00
Raphaël Doursenaud
82af0ed28f Fixed a bug preventing invoice sorting by authors 2012-05-25 16:35:46 +02:00
Laurent Destailleur
95b976c3d5 Fix: Bad action reset 2012-05-23 17:49:08 +02:00
Laurent Destailleur
190bcf61e4 Fix: Permissions to see project 2012-05-23 14:30:55 +02:00
Laurent Destailleur
229ae171de Fix: bug on projects visibility for external users 2012-05-23 13:10:51 +02:00
Laurent Destailleur
face8fc0be Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-23 13:10:15 +02:00
Laurent Destailleur
72f67f640d Merge pull request #203 from GPCsolutions/3.2 
3.2
 2012-05-23 02:58:43 -07:00
Laurent Destailleur
0b7b27e795 Fix: extrafield repair was using bad hardcoded values. 2012-05-23 11:50:55 +02:00
Laurent Destailleur
04bb23d9bf Fix: [ bug #411 ] Can't modify most properties 2012-05-23 11:20:59 +02:00
Laurent Destailleur
ed48969630 Fix: [ bug #409 ] List of vat rates for supplier prices must use the 
seller country.

Conflicts:
	htdocs/install/mysql/migration/3.1.0-3.2.0.sql
	htdocs/product/fournisseurs.php
 2012-05-23 11:07:18 +02:00
Laurent Destailleur
c1b1dcc5e7 Fix: Translation of payment term/cond 2012-05-21 20:24:20 +02:00
Regis Houssin
646651e731 Merge pull request #206 from FHenry/3.2 
3.2
 2012-05-21 07:11:38 -07:00
juanjo
952864f532 [ bug #399 ] Bad calculation of local taxes in update line products 2012-05-21 15:39:15 +02:00
FHenry
23226ad472 correct bug #410 2012-05-21 11:00:08 +02:00
Laurent Destailleur
6cf8c5c102 Fix: Check for duplicate must ignore spaces before and after 2012-05-21 10:38:48 +02:00
Laurent Destailleur
1725e5b591 Fix: [ bug #405 ] Late icon always displayed on comm/propal.php 2012-05-21 00:08:36 +02:00
Laurent Destailleur
7a49d56589 Fix: Missing name 2012-05-16 17:07:01 +02:00
Raphaël Doursenaud
43f1fbed01 Trim payment amounts 
This allows to ignore trailing characters that may triggers a warning because the payment looks greater than what's
required
 2012-05-16 17:03:15 +02:00
Laurent Destailleur
a8913704e9 Fix: W3C 2012-05-16 12:35:21 +02:00
Raphaël Doursenaud
f7476d5727 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-15 12:04:26 +02:00
Cédric Salvador
68c1fa6c34 Fix: error in syslog call 2012-05-15 11:41:41 +02:00
Laurent Destailleur
94f9fb2e2f Fix: daylight depends also on year (not only month and day) 2012-05-15 00:49:57 +02:00
Laurent Destailleur
dc1457b96a Fix: Bad timezone function. Daylight was not used. 2012-05-14 21:07:49 +02:00
Laurent Destailleur
ceb5f161f6 Fix: bad translation 2012-05-14 21:07:24 +02:00
Laurent Destailleur
b4440a6b2e Fix: Exclude nltechno modules from demo 2012-05-14 21:06:48 +02:00
Laurent Destailleur
fd362f1108 Fix: Clean sql 2012-05-13 18:04:00 +02:00
Laurent Destailleur
6f1fd1ae53 Fix: pgsql 2012-05-13 17:36:43 +02:00
Laurent Destailleur
5c62e8865a Fix: W3C 2012-05-13 17:11:31 +02:00
Laurent Destailleur
e13696db55 Fix: syntax error in name of pgsql util proc. 
Fix: Add a proc to fix pgsql problems.
 2012-05-13 16:41:45 +02:00
Laurent Destailleur
964bb0968f Fix: Missing log when error 2012-05-13 14:44:22 +02:00
Laurent Destailleur
06679ede7c Fix: style 2012-05-13 14:43:41 +02:00
Laurent Destailleur
4a4cdc0839 Fix: Style 2012-05-13 14:36:22 +02:00
Laurent Destailleur
ee31359488 Fix: pgsql compatibility not complete. 2012-05-13 14:33:46 +02:00
Laurent Destailleur
230f4f8f57 Fix: Missing lang 2012-05-12 18:31:04 +02:00
Laurent Destailleur
4278a113a0 Fix: hour reported is not user hour. To fix this, we show both hour 
"server and user" but only if it differs.

Conflicts:
	htdocs/core/lib/functions2.lib.php
 2012-05-12 16:31:51 +02:00
Laurent Destailleur
da0dc3472b Fix: Pb with backtopage 
Conflicts:
	htdocs/adherents/fiche.php
 2012-05-12 15:59:28 +02:00
Laurent Destailleur
e94b20f684 Fix: SQL error 2012-05-12 15:28:26 +02:00
Laurent Destailleur
be85c5c381 Fix: [ bug #404 ] Impossible d'ajouter un contact lorsque le module LDAP 
est actif (erreur Array 1)
 2012-05-12 12:34:18 +02:00
Laurent Destailleur
d4ca08db00 Fix: Bug #402 2012-05-11 21:27:29 +02:00
Raphaël Doursenaud
8416014cff Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-11 15:46:23 +02:00
Laurent Destailleur
c0691b01eb Fix: Synchro with group not done when editing group only of a user. 2012-05-11 12:48:29 +02:00
Laurent Destailleur
795310b934 Fix: A lot of fix for LDAP synchro 2012-05-11 12:13:47 +02:00
Raphaël Doursenaud
3e72bdbc87 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-11 11:48:35 +02:00
Regis Houssin
791c08c006 Fix: [Bug #403] Insertion Image via l'éditeur WISIWIG plante 2012-05-11 10:15:10 +02:00
Laurent Destailleur
7c7d0bd495 Fix: vat rates 2012-05-10 23:08:19 +02:00
Regis Houssin
fc46a1ff97 Fix: fetch object for hookmanager 2012-05-10 19:30:54 +02:00
Raphaël Doursenaud
decdc2a9a3 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-10 15:05:02 +02:00
Laurent Destailleur
bd0be8f358 Fix: escape html tag value 2012-05-09 20:41:41 +02:00
Laurent Destailleur
7700293bdf Fix: Bad warning 2012-05-09 18:17:18 +02:00
Laurent Destailleur
60c77f3d50 Fix: Bad warning 2012-05-09 17:59:54 +02:00
Laurent Destailleur
9f770d862d Fix: Not escaped html value 2012-05-09 17:48:10 +02:00
Laurent Destailleur
ca67f976b6 Fix: Validate broken, missing warning on bad email. 2012-05-09 17:18:56 +02:00
Laurent Destailleur
32d2b0a9d6 Fix: Warning GETPOST with alpha and int must be used ONLY if content is 
not a free text.
 2012-05-09 16:19:54 +02:00
Laurent Destailleur
30026ecddb Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-09 16:03:57 +02:00
Laurent Destailleur
d53a56f13f Fix: Missing extrafields 2012-05-09 16:02:26 +02:00
Laurent Destailleur
49c7a1f2b4 Fix: Fails to delete member 2012-05-09 15:21:43 +02:00
Regis Houssin
b9b2dbe9b1 Fix: more compatibility with multicompany 2012-05-09 12:44:30 +02:00
simnandez
84a09808fc Fix:[ bug #399 ] Bad calculation of local taxes in update line products 2012-05-09 10:29:12 +02:00
Laurent Destailleur
b623392062 Fix: Load lang 2012-05-08 23:00:13 +02:00
Laurent Destailleur
425ca83a99 Fix: [ bug #397 ] Product VAT is not coming from buying price 2012-05-08 21:55:52 +02:00
Laurent Destailleur
15efd9e8a1 Fix: update price for pgsql 2012-05-08 19:34:12 +02:00
Laurent Destailleur
50443f1977 Fix: Missing error management 2012-05-08 15:39:20 +02:00
Laurent Destailleur
2bb87aabbe Fix: bad br 2012-05-07 20:46:18 +02:00
Laurent Destailleur
2519690020 Fix: corrupted extra tables. 2012-05-07 20:44:20 +02:00
Raphaël Doursenaud
ea0e05b07c Fix: Typo 2012-05-07 19:07:59 +02:00
Laurent Destailleur
21d028c064 Fix: Width of gantt chart 2012-05-07 19:07:29 +02:00
Laurent Destailleur
c9a35c4e3a Too shadow with IE 2012-05-07 19:07:13 +02:00
Laurent Destailleur
22006aa4dc Fix: Better fix for gant view 2012-05-07 19:06:43 +02:00
Laurent Destailleur
82b31e1f5b Fix: Works with checkbox htdocs/core/class/html.form.class.php 2012-05-07 19:06:23 +02:00
Raphaël Doursenaud
7a3ef9bf8a Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-07 15:52:48 +02:00
Regis Houssin
d0480f1d90 Fix: wrong permission 2012-05-07 11:16:09 +02:00
Raphaël Doursenaud
9b4b8db189 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-07 10:04:35 +02:00
Regis Houssin
562be023c6 Fix: [Bug #384] Gantt doesn't display beyond 20 tasks 2012-05-07 09:59:36 +02:00
Laurent Destailleur
4799c6692e Fix: Removed warning and fix pb with extra fields. 2012-05-06 20:54:58 +02:00
Laurent Destailleur
01d37ad159 Fix: pagecode when using postgresql 2012-05-06 15:31:43 +02:00
Laurent Destailleur
1b2a4f4742 Fix: log must be before request 2012-05-06 15:28:51 +02:00
Laurent Destailleur
bfba7bbc7f Fix: foreign key on non existing field 2012-05-06 15:27:31 +02:00
Laurent Destailleur
8d95ae1884 Fix: Typo 2012-05-06 02:36:55 +02:00
Laurent Destailleur
748ac3a5a7 Fix: setStatut works for user class 2012-05-06 00:06:07 +02:00
Laurent Destailleur
5ea6b99593 Fix: several fixes 2012-05-06 00:03:54 +02:00
Regis Houssin
33b9c5af45 Fix: [bug #385] Can't delete a task 2012-05-05 09:28:40 +02:00
Regis Houssin
85e797596f Fix: [Bug #388] Can't modify products after moving with arrows 2012-05-05 09:20:47 +02:00
Regis Houssin
34fe219dcb Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-05 09:03:21 +02:00
Regis Houssin
2fe16db244 Fix: bad parameters 2012-05-05 09:03:04 +02:00
Laurent Destailleur
ebf73de8cd Fix: % must be sprintf format. 2012-05-05 03:02:13 +02:00
Laurent Destailleur
b26c3266ed Fix: Manual fix of italian language 2012-05-05 02:58:59 +02:00
Regis Houssin
f4759a0e6e Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-04 13:21:50 +02:00
Regis Houssin
656d4942a6 Fix: MultiCompany compatibility for public page 2012-05-04 13:21:28 +02:00
Laurent Destailleur
5953f18f54 Fix: filter on status 2012-05-03 22:58:51 +02:00
Laurent Destailleur
7a6a462ef2 Fix: Bad cr 2012-05-03 22:13:23 +02:00
Regis Houssin
21a4dd9685 Fix: missing entity field in contract 
Fix: multicompany compatibility

Conflicts:
	htdocs/contrat/class/contrat.class.php
 2012-05-03 18:45:26 +02:00
simnandez
6c7206d210 Trad: add missing translations 2012-05-02 18:17:21 +02:00
Laurent Destailleur
39e34357a1 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-02 17:33:26 +02:00
Laurent Destailleur
557c96455e Fix: Use de_De language for de_de, not de_at 2012-05-02 17:30:02 +02:00
Raphaël Doursenaud
ea07afd6c2 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-02 17:29:16 +02:00
Laurent Destailleur
7e933ca175 Merge pull request #191 from simnandez/3.2 
Trad: [ bug #378 ] status for order i, process is "waiting for reception"
 2012-05-02 07:35:03 -07:00
Laurent Destailleur
47c0b8272d Fix: Middle 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2012-05-02 14:19:34 +02:00
Laurent Destailleur
afd9b817be Fix: Missing translation 2012-05-02 13:42:49 +02:00
Laurent Destailleur
f5cc12895a Fix: Missing picto 2012-05-02 13:42:34 +02:00
simnandez
c7daf233cd Trad: [ bug #378 ] status for order i, process is "waiting for 
reception"
 2012-05-02 09:21:52 +02:00
Laurent Destailleur
9edd80b850 Fix: Clean database to allow constraints 2012-05-01 15:28:11 +02:00
Laurent Destailleur
67adc11086 Fix: [ bug #378 ] status for order i, process is "waiting for reception" 2012-05-01 15:09:50 +02:00
Laurent Destailleur
129bb0cf2f Fix: awful IE 2012-04-30 19:15:16 +02:00
Laurent Destailleur
69b429914f Fix: Firstname/Lastname lost 
Conflicts:
	htdocs/admin/tools/update.php
 2012-04-30 19:03:14 +02:00
Laurent Destailleur
74887b5850 Fix: Removed warnings 2012-04-30 09:33:43 +02:00
Laurent Destailleur
3641a4b5bb Fix: Regression 2012-04-29 21:49:03 +02:00
Laurent Destailleur
d4d598d0aa Fix: left align 2012-04-28 20:51:51 +02:00
Laurent Destailleur
450ccf31a7 Fix: Bad declaration of error_reporting 
Conflicts:
	htdocs/filefunc.inc.php
 2012-04-28 18:52:05 +02:00
Laurent Destailleur
6b9717b250 Fix: Use same algo to scan modules than admin/modules page 2012-04-28 18:50:30 +02:00
Laurent Destailleur
2a19e9d2a1 Fix: Var can't be static 2012-04-28 18:24:53 +02:00
Laurent Destailleur
9200847eaa Fix: Try a better fix. Format of content of table should depend of 
content and output rules and not on how data was input.
 2012-04-28 15:44:04 +02:00
Laurent Destailleur
3918335bf7 No new feature into a beta. Also this feature is a security 
hole for the moment, so it should not be enabled as a common default
feautre but must be kept hidden.
 2012-04-28 15:32:48 +02:00
Laurent Destailleur
99006125fd Fix: export of print sheets 2012-04-28 14:57:16 +02:00
Raphaël Doursenaud
dfcfb48057 Typo: instantanée ne prend qu'un n. 2012-04-26 15:48:22 +02:00
Raphaël Doursenaud
62ecc497fa Fix: typo in unset 2012-04-26 15:43:27 +02:00
Regis Houssin
f7b0e1a976 Merge pull request #178 from simnandez/3.2 
Fix: Bad include
 2012-04-26 01:50:43 -07:00
Regis Houssin
0092f1bc89 Fix: problem of line break between label and description when 
using fckeditor
 2012-04-26 10:29:46 +02:00
simnandez
6e84b8ca63 Fix: Bad include 2012-04-26 08:50:39 +02:00
FHenry
fa0e1ca87e remove useless line 2012-04-25 18:37:16 +02:00
FHenry
58df839271 Rename global variable from MAIN_SOCIETE_UNSUBSCRIBE to 
MAILING_EMAIL_UNSUBSCRIBE to be reliable on dolibarr implementation

Conflicts:
	htdocs/admin/mailing.php
 2012-04-25 18:36:58 +02:00
FHenry
d5b21a05b2 Remove Eclipse variable warning 2012-04-25 18:33:30 +02:00
FHenry
455789d575 Remove Eclipse Warning (Undeclare variable) 2012-04-25 18:33:09 +02:00
Laurent Destailleur
d390f3137f Fix: [ bug #367 ] "Multi-tiers" fonctionality inverted in project 
contacts.
 2012-04-21 19:44:05 +02:00
Laurent Destailleur
2b77a99fa3 Fix: [ bug #372 ] Upgrade error from 3.1.0 to 3.2.0 Beta 2012-04-21 19:12:20 +02:00
Laurent Destailleur
3a2caa3e46 Fix: Try a fix for the lost mainmenu session. 2012-04-20 20:38:49 +02:00
Laurent Destailleur
32339b03fd Add log to try to find the mainmenu lost bug. 2012-04-20 14:48:40 +02:00
Laurent Destailleur
db53aa53b6 Fix: Lines useless 2012-04-20 14:24:02 +02:00
Laurent Destailleur
ab80f6aaa7 Fix: Can clone a proposal 2012-04-20 14:06:59 +02:00
Laurent Destailleur
eff43a8e0c Fix: wrong encoding of special chars 2012-04-20 13:59:35 +02:00
Laurent Destailleur
e503b2d858 Fix: Field must be reset after adding. 2012-04-20 13:50:23 +02:00
Laurent Destailleur
216df5ad07 Fix: Add hidden option to restore lost feature. 2012-04-20 13:46:40 +02:00
Laurent Destailleur
907c7f748d Fix: Bad CR for public note. Must work when text is full text with \n 
and also when text is HTML with br.
 2012-04-20 13:41:55 +02:00
Laurent Destailleur
91b8f33ea5 Fix: textarea field was not detected 2012-04-20 13:36:51 +02:00
Laurent Destailleur
5580a4cc30 Fix: Missing translation 2012-04-20 13:23:57 +02:00