Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,613 Commits 39 Branches 191 Tags
fa79f280ea8301c5b06bed0d82efef8a7460da73
Commit Graph

42613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
fa79f280ea Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-23 12:05:45 +02:00
Florian HENRY
860253759b Add hook for addMorButton into supplier card 2014-09-23 11:59:57 +02:00
Laurent Destailleur
3b53ccbe44 Merge pull request #1893 from braito4/patch-2 
problem with type of product
 2014-09-22 23:46:48 +02:00
Florian HENRY
4b74b0529f Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-22 09:36:24 +02:00
Laurent Destailleur
d288b19f4d Merge remote-tracking branch 'origin/3.5' into 3.6 2014-09-19 11:07:15 +02:00
Juanjo Menent
c87e28d5f9 - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 
3.6.0 in supplier invoices when adding a line
 2014-09-19 09:57:35 +02:00
Laurent Destailleur
3a38153889 Typo error 2014-09-18 22:42:43 +02:00
Laurent Destailleur
2c56b85ab7 Merge pull request #1894 from braito4/patch-3 
Missing date_start, date_end in webserver server_invoice.php
 2014-09-18 17:49:08 +02:00
Laurent Destailleur
4bda5156e0 Merge pull request #1901 from ndrosis/patch-6 
Correct view greek language
 2014-09-18 17:28:36 +02:00
Laurent Destailleur
ea3d091f03 Merge pull request #1900 from ndrosis/patch-5 
Correct view greek language in PDF
 2014-09-18 17:25:44 +02:00
Laurent Destailleur
b16b1c2ce0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/class/product.class.php
 2014-09-18 10:08:56 +02:00
Laurent Destailleur
015b0d8036 Fix: Bad calculation of total 
Fix: Warning message not translated
 2014-09-18 10:05:37 +02:00
Juanjo Menent
039105a3f1 Fix: Invoices payments may be older than invoices. fr and es trans 2014-09-18 10:02:03 +02:00
Juanjo Menent
ab83e22a12 Fix: Invoices payments may be older than invoices 2014-09-18 09:57:13 +02:00
Laurent Destailleur
f0ebd7721d Fix: Restore sort feature. Still did not see why previous commit is a 
bug fix of dolibarr bug.
 2014-09-17 17:49:39 +02:00
Drosis Nikos
a41dc3acd9 Correct view greek language 2014-09-17 18:06:31 +03:00
Drosis Nikos
de6e1c5036 Correct view greek language in PDF 2014-09-17 18:01:59 +03:00
Regis Houssin
f185028707 Fix: remove hook restriction ! 2014-09-17 16:08:14 +02:00
Regis Houssin
c6b5d0f96c Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-09-17 16:07:21 +02:00
Regis Houssin
d225d92c0b Fix: remove hook restriction ! 2014-09-17 16:03:21 +02:00
Laurent Destailleur
9c54dc57df Save some usefull cleaning requests into repair.sql 2014-09-17 12:31:35 +02:00
Florian HENRY
c570b5fbfc Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-16 20:15:54 +02:00
braito4
144da16391 Missing date_start, date_end in webserver server_invoice.php 2014-09-16 19:42:11 +02:00
braito4
b7ef2db5d9 problem with type of product 
the column should be product_type
 2014-09-16 19:33:07 +02:00
Laurent Destailleur
2c0a2937f6 Merge pull request #1887 from FHenry/3.5 
add refext into fecth product
 2014-09-15 23:19:58 +02:00
Laurent Destailleur
05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
 2014-09-15 22:52:59 +02:00
Laurent Destailleur
9c70c2c3d0 Fix: cents for indian ruppes are calle paisa and paise. 2014-09-15 22:43:49 +02:00
Laurent Destailleur
fffb0f1bde Fix: bad translation key 2014-09-15 20:23:04 +02:00
Florian HENRY
ffc550de6d Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-15 09:59:02 +02:00
Florian HENRY
287e2ca032 Add ref_ext into fetch product (else fetch and update set this column to 
null)
 2014-09-15 09:58:44 +02:00
Florian HENRY
9493e252c9 add refext into fecth product 2014-09-15 09:56:40 +02:00
Laurent Destailleur
76ba3301c3 Fix: Syntax for license key 2014-09-14 22:34:17 +02:00
Laurent Destailleur
d812262ed8 Fix: Missing source 2014-09-14 21:52:52 +02:00
Laurent Destailleur
0dcd41ff01 Merge branch 'marcosgdf-bug-1546' into 3.5 2014-09-14 21:39:42 +02:00
Laurent Destailleur
c4facf20e6 Merge branch 'bug-1546' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1546

Conflicts:
	ChangeLog
 2014-09-14 21:39:25 +02:00
Laurent Destailleur
e8758bc19b Merge branch 'marcosgdf-bug-1548' into 3.5 2014-09-14 21:37:41 +02:00
Laurent Destailleur
822a3ebe7e Merge branch 'bug-1548' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1548

Conflicts:
	ChangeLog
 2014-09-14 21:37:15 +02:00
Laurent Destailleur
e93d474393 Merge branch 'marcosgdf-bug-1555' into 3.5 2014-09-14 21:35:24 +02:00
Laurent Destailleur
ef99de4e84 Merge branch 'bug-1555' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1555

Conflicts:
	ChangeLog
 2014-09-14 21:35:07 +02:00
Laurent Destailleur
85338bacb4 Merge branch 'marcosgdf-bug-1577' into 3.5 2014-09-14 21:32:11 +02:00
Laurent Destailleur
2704f50bd4 Merge branch 'bug-1577' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1577

Conflicts:
	ChangeLog
 2014-09-14 21:31:51 +02:00
Laurent Destailleur
f0d4ebe417 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-09-14 21:26:56 +02:00
Laurent Destailleur
fcbb388a72 Merge branch 'marcosgdf-bug-1589' into 3.5 2014-09-14 21:26:04 +02:00
Laurent Destailleur
3daaaadf65 Merge pull request #1880 from marcosgdf/bug-1591 
[ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them
 2014-09-14 21:24:27 +02:00
Laurent Destailleur
19e017a2c1 Merge pull request #1879 from Cubexed/3.6 
-Renamed POST "project" to "projectstart" in fiche.php
 2014-09-14 21:16:51 +02:00
Marcos García de La Fuente
7bac9444e6 [ bug #1546 ] Incorrect page number when searching in the list of bank transactions 2014-09-14 14:32:17 +02:00
Marcos García de La Fuente
9426298b95 [ bug #1548 ] Supplier payment card shows type in French 2014-09-14 14:19:46 +02:00
Marcos García de La Fuente
7a28f8e4aa [ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger 2014-09-14 13:59:06 +02:00
Marcos García de La Fuente
afd631e6e3 [ bug #1577 ] When creating new Private individual third, selected third type is ignored 2014-09-14 13:22:05 +02:00
Marcos García de La Fuente
74e16db632 [ bug #1589 ] Menu type in "Edit menu" page is not translated 2014-09-14 13:14:03 +02:00