Laurent Destailleur
c54355b63a
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-16 10:44:41 +01:00
Juanjo Menent
1930d0677e
Fix: withdrawal create error if in the same month are deleted previus
...
withdrawals.
Conflicts:
ChangeLog
2015-01-15 10:02:42 +01:00
Juanjo Menent
f03ffaf5a3
Fix: withdrawal create error if in the same month are deleted previus
...
withdrawals.
Conflicts:
ChangeLog
2015-01-15 10:00:52 +01:00
Laurent Destailleur
e20c1decdf
Fixed: object instead of soc and vis versa.
2015-01-15 03:51:47 +01:00
Laurent Destailleur
c5a3b4481e
Fixed: use object
2015-01-15 03:11:06 +01:00
Laurent Destailleur
d16ce7eb96
Fix: Bad var
2015-01-15 02:42:41 +01:00
Laurent Destailleur
362167f319
Fixed: Export was not using user assigned
2015-01-15 02:32:15 +01:00
Laurent Destailleur
4d67e6f4d4
Add ignore
2015-01-15 02:11:22 +01:00
Laurent Destailleur
ccfbd3614e
Not nice looking
2015-01-15 02:09:28 +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
4c64b8ceae
Add menu image
2015-01-14 19:12:22 +01:00
Laurent Destailleur
e3f3956bed
Sec: Bad security test
2015-01-14 19:11:56 +01:00
Laurent Destailleur
1d1970b5a1
Sec: Bad security test
2015-01-14 19:10:48 +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
Laurent Destailleur
e6d016cc48
Fixed: pmp update after makign a stock move.
2015-01-12 20:55:15 +01:00
Laurent Destailleur
dc0d12eccd
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-01-12 19:00:29 +01:00
Laurent Destailleur
58e4e01db7
Sync transifex
2015-01-12 18:59:46 +01:00
Laurent Destailleur
31fd03790e
Fixed: Prices visible into stock tab.
...
Conflicts:
htdocs/product/stock/product.php
2015-01-12 18:26:11 +01:00
Laurent Destailleur
34a1ea4bb8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-12 18:16:41 +01:00
Laurent Destailleur
1d2c8bbd4d
Fixed: Prices visible into stock tab.
2015-01-12 18:16:24 +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
Laurent Destailleur
a77a604082
Fix: include custom dir so everybody has it.
2015-01-11 15:32:11 +01:00
Laurent Destailleur
e4b89779f7
Fixed: css conflict
2015-01-10 21:39:40 +01:00
Laurent Destailleur
dda12003d4
Fixed: User of creation was not visible.
2015-01-10 12:23:15 +01:00
Laurent Destailleur
be4c5cf9d3
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-10 01:16:31 +01:00
Laurent Destailleur
30d1284379
Fixed: Missing ref_ext
2015-01-10 01:15:39 +01:00
Laurent Destailleur
cd2a9d0e09
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-10 01:07:55 +01:00
Laurent Destailleur
87f70f2d22
Fixed: property must be called billed into web service.
...
Fixed: web service to create order was useless. it was not possible to
change status.
2015-01-10 01:07:18 +01:00
Laurent Destailleur
f7960ec104
Fixed: Upgrade are done several times
2015-01-09 23:19:18 +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
Laurent Destailleur
1cc4c8513e
Merge pull request #2224 from KreizIT/batch_transfert
...
Allow warehouse transfer for batched product
2015-01-09 22:46:40 +01:00
Laurent Destailleur
baeff1dcec
Merge pull request #2228 from frederic34/tooltip
...
Add some "classfortooltip"
2015-01-09 22:44:14 +01:00
Laurent Destailleur
dbcaeb01c0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
2015-01-09 22:40:45 +01:00
Laurent Destailleur
32edb33411
Start 3.6.3
2015-01-09 22:32:25 +01:00
Laurent Destailleur
068ae7f0d4
- Fix: ref_ext was not saved when recording a customer order from web
...
service
2015-01-09 22:32:00 +01:00
Laurent Destailleur
f54e90c9cf
Better doc to install external modules.
...
Custom dir will be installed by default.
2015-01-09 13:00:10 +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
166bbeb8e9
Update en_AU separator from comma to full stop
...
Updating the en_AU Main Language - Decimal Separator from a Comma to a Full Stop
2015-01-08 11:27:32 +11:00
