Laurent Destailleur
e20c1decdf
Fixed: object instead of soc and vis versa.
2015-01-15 03:51:47 +01:00
Laurent Destailleur
ba49cce47a
Fix: The filter into event views on user must be done on assigned
...
resource, not only owner.
2015-01-15 02:06:04 +01:00
Laurent Destailleur
68441a563a
Fixed: Avoid space into address string
2015-01-14 19:17:58 +01:00
Laurent Destailleur
a2c9d5bd4a
Fixed balance of td introduced by MAX_TAB option.
2015-01-14 19:10:21 +01:00
Laurent Destailleur
e10b5637d4
Fixed: Avoid spaces into address string
2015-01-14 18:54:56 +01:00
Laurent Destailleur
806477977d
Fix: css
2015-01-14 13:51:21 +01:00
Laurent Destailleur
f92bc7986b
Add Weighted average price as default price for buying price for margin
...
calculation. Add option MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace
with first supplier price.
2015-01-14 10:46:50 +01:00
Laurent Destailleur
a886136e67
More comment and add a unit test to check that {t} tag is correctly
...
supported.
2015-01-13 22:13:15 +01:00
Laurent Destailleur
033e77c04a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/product/stock/product.php
2015-01-13 15:41:45 +01:00
Laurent Destailleur
8b3faf46db
Add PMP into selection of buy price.
2015-01-13 15:38:59 +01:00
Marcos García de La Fuente
4da52cf733
Fix: [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date
2015-01-13 11:11:37 +01:00
BENKE Charles
e07bb07bab
Update commondocgenerator.class.php
...
add extrafield on odt lines
2015-01-12 18:18:43 +01:00
Laurent Destailleur
f8b58605c6
Better organisation of entries into security setup area
2015-01-12 13:21:16 +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
e4b89779f7
Fixed: css conflict
2015-01-10 21:39:40 +01:00
Laurent Destailleur
c441aa89db
Fixed: Avoid warning
2015-01-10 18:19:44 +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
fentman
9049931ff0
Change to $listofcurrenciesbefore for GBP + AUD
...
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
2015-01-09 22:55:17 +01:00
Laurent Destailleur
027c9c4d98
Merge pull request #2226 from fentman/patch-1
...
Change to $listofcurrenciesbefore for GBP + AUD
2015-01-09 22:54:37 +01:00
Laurent Destailleur
e24a668c52
Merge pull request #2225 from frederic34/psr2
...
Psr2
2015-01-09 22:53:06 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
frederic34
73fda2cb86
WIP PSR2
2015-01-08 18:36:03 +01:00
fentman
742ec954cd
Change to $listofcurrenciesbefore for GBP + AUD
...
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
2015-01-08 11:21:25 +11:00
Raphaël Doursenaud
50c2b75ef8
Invoices: added situation (or interim) invoices support
2015-01-06 17:12:13 +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
908a95d83f
Merge pull request #2211 from marcosgdf/contract-fixes
...
Several Contract-related fixes
2015-01-06 00:18:51 +01:00
Laurent Destailleur
ce1cad2801
Merge pull request #2207 from frederic34/patch-3
...
Enhance select_categories with select2
2015-01-06 00:17:43 +01:00
Laurent Destailleur
6916fffbe2
Merge pull request #2197 from frederic34/patch-5
...
Attribut width not allowed with div or span
2015-01-06 00:08:08 +01:00
Laurent Destailleur
6a6c5c54f1
Merge pull request #2220 from aspangaro/3.7-Auguria
...
Add module accountancy expert in auguria menu
2015-01-06 00:07:26 +01:00
aspangaro
b4b5b35afa
Skype :: Better presentation
2015-01-04 20:17:49 +01:00
aspangaro
f14ea7b649
Add module accountancy expert in auguria menu
2015-01-03 15:07:54 +01:00
philippe grand
96e6c66365
better translation and typo
2015-01-01 11:24:00 +01:00
Laurent Destailleur
be34fcfa8a
Removed duplicate link making same thing
2014-12-30 21:33:56 +01:00
Laurent Destailleur
baa247ea86
Fixed: doxygen
2014-12-30 21:24:57 +01:00
Laurent Destailleur
d72d056e02
Enhance look for contacts forms of thirdparties.
2014-12-30 21:04:02 +01:00
Laurent Destailleur
8abbac564b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/main.inc.php
2014-12-30 04:28:09 +01:00
Marcos García de La Fuente
86100758ff
Miscellaneous corrections
2014-12-28 20:13:15 +01:00
Marcos García de La Fuente
ef4d710f78
Improving CommonObject and Contrat documentation
2014-12-28 19:16:14 +01:00
Marcos García de La Fuente
df1f931ab8
Fixed: [ bug #1767 ] Contract document is not generated properly
2014-12-28 18:10:41 +01:00
Frédéric FRANCE
56dd276504
Enhance search_categories with select2
2014-12-28 15:17:54 +01:00
frederic34
9c2c338dc0
Typo on variable
2014-12-28 14:21:54 +01:00
frederic34
e937039596
Merge remote branch 'upstream/develop' into printipp
2014-12-28 11:59:58 +01:00
Ion Agorria
5bbcb58b44
Added expressions for product/service prices
2014-12-28 01:26:41 +01:00
Frédéric FRANCE
dc18759c6c
Attribut width not allowed with div or span
2014-12-27 11:15:26 +01:00
Laurent Destailleur
29db4d4670
Merge pull request #2194 from atm-maxime/develop
...
in PDF, no line jump after doc linked ref. Fix bug 1605.
2014-12-26 22:07:55 +01:00
Laurent Destailleur
5d80061caf
Mark property error as deprecated
2014-12-26 22:04:16 +01:00
Marcos García de La Fuente
9f6f90275a
Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags
2014-12-26 12:03:29 +01:00
Maxime Kohlhaas
e7ebb78ffd
in PDF, no line jump after doc linked ref. Fix bug 1605.
2014-12-26 11:09:46 +01:00
Laurent Destailleur
d8557d8af0
Fixed: label
2014-12-26 05:16:00 +01:00
