Laurent Destailleur
09a9546c14
FIX Can not disabled an opened service line in a contract
2016-03-03 20:41:56 +01:00
Laurent Destailleur
99553c8230
FIX Can not disable an opened service on a contract
2016-03-03 20:39:38 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Alexis Algoud
72b532b7eb
FIX non instanciated values
2016-03-01 11:31:27 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
Laurent Destailleur
8927948bef
NEW Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
2016-02-25 16:27:28 +01:00
Laurent Destailleur
d4c3258385
Fix missing field
...
Fix bad value for default value of next date
2016-02-15 07:36:45 +01:00
Laurent Destailleur
158906455a
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:40:33 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
Laurent Destailleur
c71bb9d67c
Fix filter on contract not visible
2016-02-07 12:33:40 +01:00
Laurent Destailleur
e3a4124a58
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/fr_FR/bills.lang
2016-01-30 16:13:06 +01:00
Laurent Destailleur
5e9fd25a6e
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-30 15:59:40 +01:00
Laurent Destailleur
dfd4d36bdf
Merge remote-tracking branch 'origin/3.7' into 3.8
2016-01-30 15:58:11 +01:00
Laurent Destailleur
08b3b0cf19
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-28 23:50:23 +01:00
Laurent Destailleur
99b2236260
FIX Selection of project must no show closed project
2016-01-28 12:19:13 +01:00
Laurent Destailleur
c8d232e056
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/contrat/card.php
2016-01-28 12:18:25 +01:00
Laurent Destailleur
df4cd3de17
FIX Selection of project must no show closed project
2016-01-28 12:05:14 +01:00
Laurent Destailleur
5fd6057c6c
FIX Deadlock situation. Can't edit anymore contract.
...
FIX List of automatic events was not visible.
2016-01-26 18:22:37 +01:00
fmarcet
c2efee8a29
FIX: Contrat card don't consider user permissions to show active/unactive service button
2016-01-26 13:02:21 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
Laurent Destailleur
ed3f0ce86b
Fix totalnboflines not correctly managed
2015-12-28 00:20:48 +01:00
philippe grand
1eeee203d7
[Qual] comments should be in english
2015-12-22 09:37:27 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
f25a9030eb
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
2015-12-18 22:12:03 +01:00
Laurent Destailleur
dd3f5a32d3
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
.travis.yml
composer.json
htdocs/accountancy/admin/card.php
2015-12-18 21:20:12 +01:00
Laurent Destailleur
ebf68ecbe0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
.travis.yml
htdocs/contrat/class/contrat.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/project/pdf/pdf_baleine.modules.php
2015-12-18 21:03:57 +01:00
fmarcet
21f7271e51
FIX: Not deleting contrats on element_element table
2015-12-17 12:36:43 +01:00
philippe grand
30eb08151d
[Qual] Close database handler should be after Footer
2015-12-11 14:19:38 +01:00
Laurent Destailleur
374480043e
Add maxwidth300 on combo list for users and sale representatives
2015-12-06 00:37:58 +01:00
Florian HENRY
33e73afda6
FIX : Cannot change the date of a contract #4088
2015-12-03 10:51:03 +01:00
Laurent Destailleur
c55d11869b
Billing of supplier or customer order is a process that can be done in
...
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
Laurent Destailleur
480623a6d5
Uniformize GUI. All lists must have a search on status at end and last
...
column is dedicaded to future "mass action checkbox".
2015-11-29 13:03:46 +01:00
Laurent Destailleur
88e76dcf64
Fix utf8 encoded twice
2015-11-28 14:40:23 +01:00
philippe grand
928c44b04f
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-11-21 04:52:19 +01:00
philippe grand
4f280f63d0
[Qual] Uniformize code
2015-11-19 13:59:58 +01:00
Frédéric FRANCE
dfdc220c6b
Update list.php
2015-11-18 18:16:03 +01:00
Frédéric FRANCE
59dd1502de
Update list.php
2015-11-16 21:29:39 +01:00
Laurent Destailleur
01058be44c
NEW Introduce a "code" into fiels to describe vat. This will allow to
...
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Raphaël Doursenaud
89411541b3
Fix missing category selector
...
Complement to #3893
2015-11-05 18:49:39 +01:00
Raphaël Doursenaud
23a5c303dd
Fix #3870 Missing translation
2015-11-04 19:56:12 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
200e4638f4
Merge pull request #3812 from fappels/develop-best-pmp-pos-margin
...
Fix : #2591 Margin is incorrect used with POS
2015-11-02 11:06:20 +01:00
Laurent Destailleur
2c682022cf
NEW The search box and the bookmarks are now rendered by the menu
...
manager.
2015-10-30 09:36:57 +01:00
fmarcet
310ecb1e09
FIX: Show product image on getNomUrl()
2015-10-29 12:28:28 +01:00
fappels
4d839eea60
Fix #2591 Margin is incorrect used with POS
...
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +01:00
Laurent Destailleur
531ef43a27
Some minor look fixes.
2015-10-22 19:13:16 +02:00
philippe grand
1762b3aaa7
[Qual] Uniformize code
2015-10-17 17:09:34 +02:00
philippe grand
f31ddc23aa
[Qual] Uniformize code
2015-10-17 16:18:33 +02:00
Laurent Destailleur
8c66a7d099
Revert a bad PR. if form_confirm is replaced with formconfirm, we must
...
include a print before. It is no more included into function.
2015-10-17 02:01:13 +02:00
