Laurent Destailleur
|
1d8b9949d6
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/compta/bank/categ.php
htdocs/compta/bank/releve.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/contacts.tpl.php
htdocs/cron/list.php
htdocs/main.inc.php
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/theme/bureau2crea/style.css.php
htdocs/theme/eldy/style.css.php
htdocs/user/class/user.class.php
htdocs/viewimage.php
|
2013-06-24 20:02:02 +02:00 |
|
Regis Houssin
|
aa7e61178a
|
New: add product price sharing for multicompany
|
2013-06-24 17:13:08 +02:00 |
|
Regis Houssin
|
9992bebb13
|
New: add product price sharing for multicompany
|
2013-06-24 17:12:41 +02:00 |
|
Marcos García
|
f0454926c2
|
Fix bug #933: Ajax error
Caused by commit 7e53f98
|
2013-06-08 22:29:18 +02:00 |
|
fhenry
|
440912a4d3
|
fix [ bug #827 ] AJAX search does not respect multiprice level
|
2013-04-30 21:35:27 +02:00 |
|
Laurent Destailleur
|
8d206fdfb0
|
Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
|
2013-01-16 15:36:08 +01:00 |
|
Regis Houssin
|
b838895db9
|
Fix: change for a neutral email
|
2012-12-30 15:13:49 +01:00 |
|
Maxime Kohlhaas
|
7035ec42f1
|
Task # 559 : Modifications to store unitprice as in supplier prices
|
2012-11-07 00:38:53 +01:00 |
|
Maxime Kohlhaas
|
0f1617c31d
|
Task 559 : add use of price by qty in product selection (select and ajax search)
|
2012-10-26 01:00:03 +02:00 |
|
Regis Houssin
|
c98e456ba9
|
Fix: missing <br> and strict mode
|
2012-09-07 18:16:05 +02:00 |
|
Regis Houssin
|
d6918d7a87
|
Fix: upgrade ckeditor
|
2012-08-29 16:31:48 +02:00 |
|
Regis Houssin
|
3e2be54ead
|
Fix: restore old method
|
2012-08-27 19:11:44 +02:00 |
|
Regis Houssin
|
07a10d3984
|
Fix: add compatibility with old static combobox
|
2012-08-27 17:18:46 +02:00 |
|
Marcos García
|
f3674317ec
|
Removed parenthesis from all require and replaced with single quotes
|
2012-08-22 23:24:21 +02:00 |
|
Marcos García
|
706d79986c
|
Removed parenthesis from all require_once and replaced with single quotes
|
2012-08-22 23:11:24 +02:00 |
|
Regis Houssin
|
77a5ef0b22
|
Fix: move ajax response in ajax directory
|
2012-07-29 10:24:42 +02:00 |
|