Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Laurent Destailleur
3b70bbb05a
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/admin.lib.php
2016-03-02 23:07:42 +01:00
Laurent Destailleur
2eaa21ea5c
Fix minor css error (pixel size must have "px"). Compatibility with old
...
behaviour.
2016-02-29 10:50:52 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Florian HENRY
ee08c4afc4
Display the ref_supplier inside the contract list of /comm/card.php
...
#4090
2015-12-03 11:03:40 +01:00
Florian HENRY
b4160c7f81
Cannot change the date of a contract #4088
2015-12-03 10:58:06 +01:00
philippe grand
d06a445e01
[Qual] Uniformize code
2015-11-10 19:22:27 +01:00
philippe grand
b34edeb751
[Qual] Uniformize code
2015-11-07 21:56:21 +01:00
Laurent Destailleur
132bc610b6
Icon for contact contains a part of thirdparty icon to make things
...
easier to understand
2015-10-25 23:32:49 +01:00
Laurent Destailleur
5181afd49d
Disable dead code
2015-10-24 19:29:41 +02:00
Maxime Kohlhaas
4de7874118
New : review customer account summary and balance
2015-10-19 20:36:25 +02:00
Maxime Kohlhaas
55657690bf
Remove unused var
2015-10-19 19:07:02 +02:00
Maxime Kohlhaas
a953a66616
New : allow to define list size for object list on customer card
2015-10-19 19:05:04 +02:00
Laurent Destailleur
a84ec64ece
The new banner tab is available on all tabs of thirdparty.
2015-10-13 13:06:32 +02:00
Laurent Destailleur
077c696c09
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/.gitignore
htdocs/theme/.gitignore
2015-09-22 16:28:34 +02:00
Florian HENRY
a0fb27bd80
FIX : Can create Proposal on close thridparty #3526
2015-09-15 14:34:49 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Laurent Destailleur
581b6d0001
Fix: missing status on contacts
2015-07-14 11:51:27 +02:00
Laurent Destailleur
bdba8f1f38
Fix courrent outstanding amount not visible
2015-06-23 23:33:25 +02:00
Laurent Destailleur
825369230f
Finishment of look
2015-06-20 23:33:13 +02:00
Laurent Destailleur
fb1a3f3ea3
Rename alternative name
2015-06-16 12:04:11 +02:00
Marcos García de La Fuente
a496606826
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/soc.php
2015-06-13 02:45:42 +02:00
Raphaël Doursenaud
4e143755e8
Fix: missing categories class in customer/prospect card
...
Also check that the categories module is enabled and user has permissions to see categories
2015-06-12 15:56:39 +02:00
Laurent Destailleur
4c7ccf6145
NEW Can filter on contact status in prospect list. Removed deprecated
...
menu entry.
2015-06-05 10:49:02 +02:00
Raphaël Doursenaud
bbd0b89087
Added tags/categories management to customers
...
Customers part of #2571
2015-05-29 18:50:43 +02:00
Marcos García de La Fuente
ce7ed70d74
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2015-05-10 12:23:07 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
Laurent Destailleur
3a8cf17f3c
NEW Can edit list of prospect status for customers/prospects. Add a new
...
entry into dictionary table to manage list fo status.
Removed deprecated files.
2015-05-06 23:13:07 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Marcos García de La Fuente
15b1f03a08
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/list.php
htdocs/comm/prospect/list.php
htdocs/societe/consumption.php
htdocs/societe/soc.php
2015-04-19 00:48:07 +02:00
Maxime Kohlhaas
2ddef9ffd9
Alert when oustanding amount excedeed
2015-04-18 19:08:44 +02:00
Maxime Kohlhaas
8e4771daa0
Fix : outstanding limit was not saved
2015-04-18 18:48:50 +02:00
Laurent Destailleur
39e4f52497
Fix: all amount must be without tax
2015-04-13 19:11:23 +02:00
Laurent Destailleur
1bbecc0912
Restore link to stock for products.
2015-04-08 19:26:36 +02:00
Marcos García de La Fuente
8b8171c700
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/card.php
2015-03-30 03:25:57 +02:00
frederic34
19540b14b5
Add last shipments to company card
2015-03-25 16:38:18 +01:00
Laurent Destailleur
79ca1fe147
Clean code.
2015-03-15 23:32:43 +01:00
Marcos García de La Fuente
b822a1e3ad
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-15 18:20:17 +01:00
Laurent Destailleur
2a09e34bdf
Uniformize etrafields visibility for thirdparties card
2015-03-14 13:05:28 +01:00
Laurent Destailleur
9e4e9a5411
NEW: Can search on customer order amount into customer order list.
2015-03-06 20:59:18 +01:00
Marcos García de La Fuente
2ba795fcbc
NEW: [ task #851 ] Add a new field: Commercial name
2015-02-28 14:30:06 +01:00
Laurent Destailleur
203ff13a62
Merge branch 'develop' of https://github.com/mrsof/dolibarr into
...
mrsof-develop
Conflicts:
htdocs/comm/card.php
2015-02-24 17:00:52 +01:00
Sof
5599deec00
FIX : Edit in place of "Outstanding Limit"
...
Edit in place not working for field "Outstanding Limit" in view mode for third party :
- Field type 'amount' do not work in "Edit in place" mode.
- Update returns an error "Unknown field 'OutstandingBill' in field list" when in "Edit in place" mode.
2015-02-24 13:44:00 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
BENKE Charles
c3bf3c45d7
Update card.php
...
Display amount and link to unpaid bill
2015-02-13 04:13:32 +01:00
Marcos García de La Fuente
023175b9f1
PHPDoc and misc fixes for several folders
2015-02-10 11:38:13 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00