Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 05:51:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,188 Commits 36 Branches 190 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

4057 Commits

Author SHA1 Message Date
Drosis Nikos
872fe15743 Check live last version from sourceforge.net 2015-01-26 17:05:47 +02:00
frederic34
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
cla
134759ce28 update table name facture_fourn_det_extrafields 2015-01-22 15:02:19 +01:00
cla
c953a04687 Added files for Extrafields in Order/Invoice Supplier Line. New files 
sql added in install/mysql folder and 2 new pages to insert extrafields
in admin folder
 2015-01-22 14:18:33 +01:00
Marcos García de La Fuente
fb186d6ef8 Added delay between mails in Newsletter module 2015-01-18 16:26:26 +01:00
Ion Agorria
48c6897f75 Store per entity SMTP configuration 2015-01-18 03:20:35 +01:00
Laurent Destailleur
30abacd0a6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 14:42:42 +01:00
Laurent Destailleur
87a59ef527 Merge branch 'develop_bank_extrafields' of 
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields

Conflicts:
	htdocs/admin/bank.php
 2015-01-17 14:42:04 +01:00
Laurent Destailleur
6a081fe883 Merge pull request #2229 from frederic34/getnextvalue 
Translation error messages numbering modules
 2015-01-16 12:08:53 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
13132ef2ed Better organisation of entries into security setup area 2015-01-12 13:20:27 +01:00
frederic34
173d3aaa90 Translation error messages numbering modules 2015-01-11 11:31:53 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Laurent Destailleur
443c9d245e Merge pull request #2212 from marcosgdf/misc-doc 
Miscellaneous corrections
 2015-01-06 00:21:05 +01:00
Laurent Destailleur
df3987fa10 Fixed: Bad url link with jquery mobile. We must add rel="external" on 
all external links.
 2015-01-04 14:51:16 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +01:00
Frédéric FRANCE
3d9ce4c1dc Admin config for ask for payment bank during order 2014-12-21 10:32:11 +01:00
Laurent Destailleur
c05c2fe427 Info to help debug perf pb. 2014-12-20 18:46:29 +01:00
Philippe GRAND
8878ef601f form should open before table 2014-12-16 15:34:56 +01:00
Philippe GRAND
cf196c77fb one close form too much 2014-12-16 15:15:03 +01:00
Philippe GRAND
69c1de3fe1 one close form too much, an other at the wrong place 2014-12-16 15:07:23 +01:00
Philippe GRAND
e40ef3f9ce form closed at the wrong place 2014-12-16 14:49:07 +01:00
Philippe GRAND
dd6d6bc054 open form was at the wrong place 
missing close form
 2014-12-16 14:43:28 +01:00
Laurent Destailleur
8a6f7df186 Merge remote-tracking branch 'origin/3.7' into develop 2014-12-14 12:37:20 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Laurent Destailleur
da3bc3868d Fixed: Duplicated lang key 2014-12-14 11:46:21 +01:00
Laurent Destailleur
627e344c78 Documentation of external link. 2014-12-11 14:43:14 +01:00
Laurent Destailleur
03cfff66ea Fixed: no form into table 2014-12-11 14:26:34 +01:00
Laurent Destailleur
63f2bfed24 Fixed: Maxi debug of withdrawal module. 2014-12-09 11:19:16 +01:00
Laurent Destailleur
d7dd496239 Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5 2014-12-08 00:09:01 +01:00
Laurent Destailleur
344aa40858 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	dev/codesniffer/ruleset.xml
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 20:21:40 +01:00
Laurent Destailleur
a9338a0f9f Fix: Maxi debug of module productbatch. 
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 16:04:37 +01:00
Laurent Destailleur
5457d3116a Fix: Maxi debug of module productbatch. 2014-12-05 16:01:01 +01:00
Laurent Destailleur
8d405a147f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php
 2014-12-04 15:29:45 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/projet/tasks/task.php
 2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Laurent Destailleur
b5d74372de Bad var 2014-12-04 01:36:53 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
 2014-12-03 12:54:42 +01:00
Frédéric FRANCE
79314b7ff8 Fix missing space 2014-12-03 12:47:11 +01:00
Laurent Destailleur
1a67ae10a4 Merge pull request #2119 from frederic34/patch-7 
Fix missing space
 2014-12-03 12:46:44 +01:00
Laurent Destailleur
2ddc3cb3f0 Fix: Using a select with checkbox will not be compatible when we will 
add feature to put box on other pages.
 2014-12-03 12:43:14 +01:00
Frédéric FRANCE
58621e7e13 Update boxes.php 2014-12-03 12:32:37 +01:00
Laurent Destailleur
6a09bca21e Merge pull request #2120 from frederic34/patch-8 
Update admin config for boxes
 2014-12-03 12:24:03 +01:00
aspangaro
f6ab7ca0c9 Typo 2014-12-02 20:42:47 +01:00
BENKE Charles
3c12d5f420 Update supplierinvoice_extrafields.php 
add orders translation files for correct menu translation error
 2014-12-02 10:36:48 +01:00
Frédéric FRANCE
aade7309e0 Update boxes.php 2014-11-30 15:56:57 +01:00