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

40512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García de La Fuente
e562930cc2 Corrected Vagrant box URL 2014-02-16 01:00:18 +01:00
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
4b5748fd12 Fix: Can not set delay to zero. 2014-02-14 12:58:03 +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
Laurent Destailleur
cd2ddf2545 Merge pull request #1418 from grandoc/develop 
display adherent module for external user
 2014-02-13 17:48:09 +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
0d03f13777 Add comments 2014-02-12 15:21:06 +01:00
Laurent Destailleur
b4977cd542 Fix: Bad permission var 2014-02-12 12:52:31 +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
05c4961a36 Better css 2014-02-12 00:10:49 +01:00
Laurent Destailleur
2d6b5e377c Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-02-12 00:02:16 +01:00
Laurent Destailleur
4869b95601 Fix: Default size too long making screen hang. 2014-02-12 00:01:22 +01:00
Laurent Destailleur
492dec0854 Sync from transifex 2014-02-11 23:19:22 +01:00
Laurent Destailleur
e62b6c1cc4 Fix: Not using correct vars names 2014-02-11 15:43:05 +01:00
Laurent Destailleur
598098ff18 Fix: Not using correct vars names 2014-02-10 16:09:21 +01:00
Laurent Destailleur
444bc1c6a1 New increase length of url into bookmark module. 2014-02-10 16:05:13 +01:00
Laurent Destailleur
f743cbafa2 Fix: doxygen 2014-02-10 01:43:35 +01:00
Laurent Destailleur
213a64edcc Fix for missing param. 2014-02-10 01:36: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
e833849f85 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-02-10 01:12:14 +01:00
Laurent Destailleur
d81685a737 Merge pull request #1409 from atm-geoffrey/develop 
Add hooks and triggers on supplier invoice, supplier order and product supplier price
 2014-02-10 01:11:13 +01:00
Laurent Destailleur
e71fb36b3c Add patch ISO 9362 http://fr.wikipedia.org/wiki/ISO_9362 manually. 
We keep bic size field to 20 instead of 11 for backward compatibility.
 2014-02-10 01:08:49 +01:00
Laurent Destailleur
b18c9603f1 Fix: Even if accounting module are disabled, we need field. Accounting 
mdules disabled = we don't need menu+pages+reports features but
properties on product may be still used (for example to import/import
when using an external accounting software).
 2014-02-10 01:04:40 +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
3906aaee8f Work on pdf doc generator 2014-02-10 00:25:16 +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
6a84a7f935 Prepare version 3.5.1 2014-02-08 13:56:28 +01:00
Laurent Destailleur
70ab096b79 More simple specimen for test 2014-02-08 12:58:27 +01:00
Laurent Destailleur
59a25832bd Fix: Removed large comment into migration script 2014-02-08 12:16:27 +01:00
Laurent Destailleur
b94f7a6a6d Fix some amount were missing local version. 2014-02-08 03:51:30 +01:00
Laurent Destailleur
7f7222555e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-02-08 03:45:48 +01:00
Laurent Destailleur
f6f6022b7a Add eu_ES language. 2014-02-08 03:44:53 +01:00
Laurent Destailleur
fdfb7f1a8a Fix: Be sure there is no duplicate default rib. 2014-02-08 03:24:48 +01:00
Laurent Destailleur
5b89bc18f5 [ bug #1231 ] PDF always generated in interventions 2014-02-08 02:46:05 +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
abc8649e02 Fix: Bug of import of agenda when using https link 2014-02-08 01:16:20 +01:00
Laurent Destailleur
319b13dafb Fix: Field nature is not correctly filled. 2014-02-08 01:02:09 +01:00
Laurent Destailleur
b714347b6b Fix: Substition of extra field was ko for order. 2014-02-08 01:01:31 +01:00
Laurent Destailleur
fb789b8197 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-02-08 00:40:51 +01:00
Laurent Destailleur
56a36ba9c4 Fix: bad translation of date format for pt_BR 2014-02-08 00:36:38 +01:00
simnandez
34e73e1b7c Trad: es_ES Sync from transifex 2014-02-07 18:12:30 +01:00
Laurent Destailleur
e1880a6394 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-02-06 20:57:58 +01:00
Laurent Destailleur
43970b3bd6 Removed some TODO 2014-02-06 20:45:50 +01:00