Laurent Destailleur
1a3bace4e6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-02-14 12:59:26 +01:00
Laurent Destailleur
3e3c541e4c
Fix: Do not report trigger errors twice.
...
Fix: Error when creating event was not reported.
2014-02-14 12:54:04 +01:00
Laurent Destailleur
57153e4de4
Try a cleaner javascript escape function.
2014-02-13 23:40:39 +01:00
Laurent Destailleur
d6ba18cc20
Merge pull request #1416 from syrus34/patch-2
...
Add fields company_iban and company_bic
2014-02-13 17:53:08 +01:00
philippe
6f129c3800
display adherent module for external user
2014-02-13 16:36:34 +01:00
Laurent Destailleur
ead7df3306
Add backslash
2014-02-13 10:54:03 +01:00
syrus34
79d85d5888
Add fields company_iban and company_bic
2014-02-12 18:58:12 +01:00
Laurent Destailleur
634c5b64f1
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/product/fiche.php
2014-02-12 00:25:08 +01:00
Laurent Destailleur
266b413139
Fix: colspan for extrafields
2014-02-12 00:23:15 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
bd25a98e03
New: Generation auto of barcode is available for product.
2014-02-10 00:24:20 +01:00
Laurent Destailleur
94be4ec897
Fix: Avoid error in migration from 3.1 version.
...
Fix: Suggested migration choice was ko from x.y.z to x.y.z+1
2014-02-08 14:55:27 +01:00
Laurent Destailleur
b94f7a6a6d
Fix some amount were missing local version.
2014-02-08 03:51:30 +01:00
Laurent Destailleur
aad7885bca
Fix: [bug #1226 ] page ne se charge pas quand beaucoup de prospect en
...
base
2014-02-08 02:35:59 +01:00
Laurent Destailleur
b750e98d40
Fix: Pb of file upload and download.
2014-02-08 02:02:01 +01:00
Laurent Destailleur
b714347b6b
Fix: Substition of extra field was ko for order.
2014-02-08 01:01:31 +01:00
Laurent Destailleur
43970b3bd6
Removed some TODO
2014-02-06 20:45:50 +01:00
Laurent Destailleur
80046a5310
Qual: Mutualize code
2014-02-06 20:40:01 +01:00
Laurent Destailleur
9e06f185c5
Fix: Fix problem of invalid paypal link with \n.
2014-02-06 18:19:49 +01:00
Laurent Destailleur
c9b1c562cc
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-02-06 16:58:53 +01:00
Laurent Destailleur
7078970ed1
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2014-02-05 21:03:05 +01:00
Laurent Destailleur
255a1f6497
Fix: String translated twice
2014-02-05 20:57:43 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
e3ac9db9ec
Fix: Data was encode twice making bad translation for language with
...
special chars.
2014-02-05 12:11:39 +01:00
Laurent Destailleur
9a985821d2
Fix: doxygen
2014-02-04 21:08:25 +01:00
Laurent Destailleur
d8b8f8c646
Uniformize code for contacts forms.
2014-02-04 20:49:07 +01:00
Laurent Destailleur
0da1a64335
Fix: Missing vars and bar id.
2014-02-04 20:41:23 +01:00
Laurent Destailleur
408a028320
Fix: Must return a string
2014-02-03 20:07:25 +01:00
Laurent Destailleur
8f3e9b1832
Fix: function must return a string
2014-02-03 20:05:56 +01:00
Laurent Destailleur
89ebb3c0ef
New: Add option MAIN_DISABLE_AJAX_COMBOX
2014-02-03 19:47:35 +01:00
Laurent Destailleur
efcff80a28
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/control
htdocs/fourn/facture/paiement.php
2014-02-03 18:44:48 +01:00
BENKE Charles
b86322c14a
Update commonobject.class.php
...
hook module need extrafields parameter too
2014-02-01 12:55:05 +01:00
Laurent Destailleur
9aaafde6d5
Fix: Pb with cache files for graphical boxes:
...
Missing year into cache id.
User with restrcited permission on thirdparty must not share same cache
files that "see all" users.
2014-01-31 18:48:57 +01:00
Laurent Destailleur
ba931e18d4
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-31 18:12:54 +01:00
Laurent Destailleur
40a53d4b57
Fix: used bad constant name
2014-01-31 16:06:28 +01:00
Laurent Destailleur
7f15aa4582
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-01-31 11:41:17 +01:00
Laurent Destailleur
1b88ab2355
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/contact/class/contact.class.php
2014-01-31 10:12:41 +01:00
Laurent Destailleur
a2afea7ba9
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-30 18:21:04 +01:00
Laurent Destailleur
85436f871c
Sec: Missing permission tests
2014-01-30 11:48:14 +01:00
Laurent Destailleur
0e9477167d
Fix: Bad output of extrafields when list is used.
2014-01-30 11:47:25 +01:00
Laurent Destailleur
8abde9e11f
Sec: Missing permission tests
2014-01-30 11:44:31 +01:00
Laurent Destailleur
5076e8ce4e
Fix: Bad output of extrafields when list is used.
2014-01-30 10:48:10 +01:00
Laurent Destailleur
bd3a64d580
Add test ($conf->global->FEATURES_LEVEL >= 2) for extrafields on
...
detailed lines because this feature is currently bugged.
Should work when the 2 forms (predefined product and free product) will
be merged into one (planned for 3.6)
2014-01-30 01:35:01 +01:00
BENKE Charles
a10ccb4d92
Update objectline_add.tpl.php
...
Adding extra fields on line of element
2014-01-29 16:45:37 +01:00
Florian Henry
779aaa51ab
reset function2.lib.php to orign
2014-01-29 10:13:00 +01:00
Florian Henry
526c383f10
Add complete head into agenda
2014-01-29 10:11:39 +01:00
Florian Henry
ca556485e0
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-29 10:09:44 +01:00
Laurent Destailleur
ee41273286
Fix: Count of files were wrong
2014-01-26 19:27:42 +01:00
Laurent Destailleur
cd277aaf12
Fix: Missing translation
2014-01-26 19:10:05 +01:00
