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

40531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f987a43358 Fix: Translation 2014-02-17 11:19:50 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-16 19:47:51 +01:00
Laurent Destailleur
85e93872b3 Fix: javascript calculation of unit price from margin rate was broken. 2014-02-16 19:42:43 +01:00
Laurent Destailleur
3aba53a9ae Fix: javascript calculation of unit price from margin rate was broken. 2014-02-16 19:26:41 +01:00
Laurent Destailleur
b081083a1a Fix: Bad management of date. 
Fix: Submit button was not visible making not possible to filter on
date.
Fix: Use standard css style instead of hardcoded css.
 2014-02-16 17:07:17 +01:00
Laurent Destailleur
fd22c9b69a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-02-15 15:23:47 +01:00
Laurent Destailleur
46d1181aed Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-02-15 15:23:42 +01:00
Laurent Destailleur
295f0fd9e7 Makepack is for version 3.5 2014-02-15 15:23:21 +01:00
Laurent Destailleur
7e3c2d40ba New: Make difference between virtual and physical stock easier to 
understand.
 2014-02-15 14:14:49 +01:00
Laurent Destailleur
7e2027ec39 Fix: Can not set delay to zero. 2014-02-14 13:05:49 +01:00
Laurent Destailleur
4b8d39af9d Fix: Do not report trigger errors twice. 
Fix: Error when creating event was not reported.

Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-14 13:05:04 +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
Laurent Destailleur
b499efeccf Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/compta/sociales/index.php
	htdocs/compta/tva/index.php
 2014-02-12 22:29:56 +01:00
Laurent Destailleur
7d74d0d3bd CFix: The order field for prospect level was not visible making 
dictionnary useless.
 2014-02-12 22:28:16 +01:00
Laurent Destailleur
ccab2b7af4 Fix: Must use "null" for value when finished is not defined but not when 
finished is "0".
 2014-02-12 19:00:06 +01:00
syrus34
79d85d5888 Add fields company_iban and company_bic 2014-02-12 18:58:12 +01:00
Laurent Destailleur
5501809844 Fix: sql compare on int must not contains quotes. 2014-02-12 18:47:16 +01:00
Laurent Destailleur
cd44548867 Merge pull request #1414 from atm-alexis/3.5 
In certain case, holiday_users won't be update (1 delete, 1 add for ex)
 2014-02-12 18:39:56 +01:00
Laurent Destailleur
191ff05873 Fix: W3C. 2014-02-12 18:36:49 +01:00
Laurent Destailleur
0d03f13777 Add comments 2014-02-12 15:21:06 +01:00
Laurent Destailleur
2e7631fa78 Fix: translation 2014-02-12 15:17:33 +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
Alexis Algoud
d8e5fd20d2 In certain case, holiday_users won't be update (1 delete, 1 add for ex) 
Add a fonction for count the real number of user without CP
 2014-02-10 09:39:26 +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