Commit Graph

44698 Commits

Author SHA1 Message Date
frederic34
77f1e587e6 Some translations 2014-11-01 22:08:18 +01:00
frederic34
f23f16da86 Try to improve stock display for all stock increase/decrease options 2014-11-01 21:38:50 +01:00
Laurent Destailleur
a1a10edc30 Merge pull request #1987 from IonAgorria/soap-client-order
Added SOAP client for creating a client order in remote webservice
2014-11-01 21:14:19 +01:00
BENKE Charles
5586893ca2 Update odf.php
add new fonction getvalue (valuename)
return value inside [valuename][/valuename] tag
2014-11-01 21:00:28 +01:00
Laurent Destailleur
167ec6917a Can add prefix into generated filename. This will save time for script
to build kit of files for book keeper.
2014-11-01 20:15:51 +01:00
Laurent Destailleur
762eb1cd48 Style were lost 2014-11-01 20:04:01 +01:00
Laurent Destailleur
b8faed9fe8 Fix: translation 2014-11-01 19:50:56 +01:00
Laurent Destailleur
53dfda1413 Fix: Chars - is no more allowed into value for code for extra fields. 2014-11-01 19:34:20 +01:00
aspangaro
26c63f3ea4 donation list 2014-11-01 15:06:46 +01:00
aspangaro
5122b32ccc Salaries list 2014-11-01 14:59:39 +01:00
aspangaro
a0d3dbd93c Social Contrib list 2014-11-01 14:52:05 +01:00
aspangaro
9e07c3a7b6 Typo 2014-11-01 14:51:52 +01:00
aspangaro
abfa1a5fde cheque list 2014-11-01 14:28:28 +01:00
aspangaro
4951feeb8f Correct rights & presentation 2014-11-01 07:59:52 +01:00
aspangaro
24d0568e5a Merge remote-tracking branch 'Upstream/develop' into develop-patch 2014-10-31 21:21:52 +01:00
Ion Agorria
82aa8458bf Added ws url/key to thirdparty SQL table, class and info page 2014-10-31 17:46:11 +01:00
Maxime Kohlhaas
ccddf0d1be Fix : actioncomme report was not filtering by entity... 2014-10-31 16:56:14 +01:00
Laurent Destailleur
9c51effe5c Ajout plus d'info dans description audit. 2014-10-31 15:42:35 +01:00
aspangaro
e43de8b815 Update module accounting 2014-10-31 07:37:59 +01:00
Ion Agorria
557cbaf3d7 Added module descriptor and activation checks
Corrected 3 missing $error_occurred flags
2014-10-31 04:59:57 +01:00
Laurent Destailleur
24862d6314 Corrections launchpad 2014-10-30 22:51:06 +01:00
aspangaro
57f49ec5d4 GPLv3 2014-10-30 20:41:08 +01:00
Laurent Destailleur
6e0e812531 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-30 19:28:43 +01:00
Laurent Destailleur
2f5c7e5f9d Prepare version 3.7 beta 2014-10-30 19:28:22 +01:00
Frédéric FRANCE
08e958152c Update ajax.lib.php 2014-10-30 18:45:47 +01:00
Frédéric FRANCE
f18e513046 Update html.form.class.php 2014-10-30 18:44:56 +01:00
Laurent Destailleur
4226c27ccf Merge pull request #1965 from frederic34/patch-4
On/Off for Object (do not restrict to product)
2014-10-30 18:21:50 +01:00
Laurent Destailleur
a035d7d176 Merge branch 'AMMD-agenda-export-by-project' into develop 2014-10-30 18:20:00 +01:00
Laurent Destailleur
d5f21caca6 Update doc 2014-10-30 18:19:41 +01:00
Laurent Destailleur
8d964e03d2 Merge branch 'agenda-export-by-project' of github.com:AMMD/dolibarr into
AMMD-agenda-export-by-project

Conflicts:
	htdocs/admin/agenda_xcal.php
2014-10-30 18:19:13 +01:00
Laurent Destailleur
871c4f1b20 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-10-30 18:16:06 +01:00
Laurent Destailleur
82812aa679 Merge pull request #1970 from FHenry/develop
Add hook method to simply display child lines in order/invoice/propal
2014-10-30 18:11:41 +01:00
Laurent Destailleur
3e12239f11 Merge pull request #1971 from defrance69/patch-25
Update commondocgenerator.class.php
2014-10-30 18:10:52 +01:00
Laurent Destailleur
e3041f45ee Update changelog 2014-10-30 18:08:42 +01:00
Laurent Destailleur
aac24c887f Merge pull request #1973 from jfefe/patch-6
Avoid missing class error for fetch_thirdparty method
2014-10-30 18:07:49 +01:00
Laurent Destailleur
fb4858a5d3 Update changelog 2014-10-30 18:07:09 +01:00
Laurent Destailleur
058a7a9743 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-30 18:04:51 +01:00
Laurent Destailleur
9d9a1e0701 Merge pull request #1974 from grandoc/develop
encrease name length for societe
2014-10-30 18:04:38 +01:00
Laurent Destailleur
6a1a0303d8 Merge pull request #1975 from frederic34/patch-1
"Is Order shippable" icon
2014-10-30 18:03:44 +01:00
Laurent Destailleur
28c0c55780 Merge pull request #1977 from atm-maxime/develop
Add : statistics on supplier orders and invoices on home page
2014-10-30 17:59:07 +01:00
Laurent Destailleur
80581b2908 Merge pull request #1978 from atm-maxime/3.6
Fix : product list was wrong on supplier invoice because fourn_id is not fetched
2014-10-30 17:56:22 +01:00
Laurent Destailleur
e607a53ca3 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Conflicts:
	ChangeLog
2014-10-30 17:53:38 +01:00
Laurent Destailleur
aac4609f2d Merge branch 'aspangaro-3.6-patch' into 3.6 2014-10-30 17:52:21 +01:00
Laurent Destailleur
5ec2c1c4b3 Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into
aspangaro-3.6-patch

Conflicts:
	ChangeLog
2014-10-30 17:52:08 +01:00
Laurent Destailleur
f7552c83d2 Fix: Must ignore such fields 2014-10-30 17:50:34 +01:00
Laurent Destailleur
d6c1b71350 Merge pull request #1983 from atm-maxime/mkoevols
Fixes on extrafields, product supplier prices and user / company association deletion
2014-10-30 17:49:53 +01:00
Laurent Destailleur
bb72932601 Merge pull request #1985 from FHenry/3.6
Fix extrafield from list feature where filter is provided
2014-10-30 17:49:03 +01:00
Laurent Destailleur
87901d07de Merge pull request #1986 from jfefe/patch-7
Update makepack-dolibarr.pl : indentation
2014-10-30 17:47:21 +01:00
Laurent Destailleur
c15191375a Merge pull request #1984 from frederic34/patch-3
No thirdparty name in contract list
2014-10-30 17:36:24 +01:00
Laurent Destailleur
23e9e228c7 Merge pull request #1988 from ilizaran/patch-1
Update server_invoice.php
2014-10-30 17:32:35 +01:00