Sof
|
0cee4b016b
|
FIX : Typo
|
2016-02-05 19:46:01 +01:00 |
|
BENKE Charlie
|
0517435797
|
add product document generation
|
2016-02-04 16:21:27 +01:00 |
|
BENKE Charlie
|
db0c8740b9
|
add administration feature of products docs
|
2016-02-04 16:17:45 +01:00 |
|
Laurent Destailleur
|
47e2e33fb7
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
|
2016-02-03 03:27:17 +01:00 |
|
Laurent Destailleur
|
165771b652
|
FIX #4439
|
2016-02-03 01:46:30 +01:00 |
|
Laurent Destailleur
|
bbf15d6a5d
|
FIX #4498
|
2016-02-03 01:20:06 +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
|
c9661ee20e
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-01-30 15:57:09 +01:00 |
|
Laurent Destailleur
|
6e69e99227
|
FIX VAT Rate was not visible in log of old price list
|
2016-01-30 15:34:06 +01:00 |
|
Laurent Destailleur
|
83b297a9b2
|
FIX VAT Rate was not visible in log of old price list
|
2016-01-30 15:33:11 +01:00 |
|
fmarcet
|
e3d8a9a8a4
|
FIX: Doesn't collect the value of the cost price correctly
|
2016-01-27 12:13:31 +01:00 |
|
fmarcet
|
eec8d30625
|
FIX: Not returning the correct multilevel price
|
2016-01-27 10:57:04 +01:00 |
|
Marcos García de La Fuente
|
83263e242e
|
Corrected typo of PR #4444
|
2016-01-23 20:32:22 +01:00 |
|
Laurent Destailleur
|
4df584e57b
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/lib/files.lib.php
|
2016-01-23 11:51:56 +01:00 |
|
Laurent Destailleur
|
dbaa43f3be
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
|
2016-01-23 11:45:39 +01:00 |
|
Laurent Destailleur
|
dc438792f4
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/fourn/commande/card.php
|
2016-01-23 11:39:37 +01:00 |
|
Laurent Destailleur
|
9be246baa5
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-01-23 11:32:06 +01:00 |
|
Laurent Destailleur
|
d2f5f5c01f
|
Merge pull request #4266 from fappels/develop_multi_warehouse
Add shipping and dispatching from/to multiple warehouses
|
2016-01-22 02:26:25 +01:00 |
|
Marcos García de La Fuente
|
da637db162
|
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
|
2016-01-18 10:17:59 +01:00 |
|
Laurent Destailleur
|
7b14b5e115
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
|
2016-01-14 13:30:27 +01:00 |
|
Laurent Destailleur
|
7b4ebb498e
|
Merge pull request #4415 from fappels/3.9-4409
Fix #4409 totals not shown in stock/list
|
2016-01-14 11:07:47 +01:00 |
|
fappels
|
f264b5e451
|
Revert changes stock/list, moved to PR #4415
|
2016-01-13 16:43:34 +01:00 |
|
fappels
|
284722ef3c
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse
|
2016-01-13 16:41:34 +01:00 |
|
fappels
|
f150676908
|
Fix #4409 totals not shown in stock/list
|
2016-01-13 16:33:51 +01:00 |
|
Laurent Destailleur
|
d396612a7c
|
NEW: Add a new method for margin calculation. Added margin on "cost
price" to margin on WAP price and margin on "best supplier price".
|
2016-01-13 12:48:59 +01:00 |
|
Laurent Destailleur
|
381eea0dbf
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
|
2016-01-12 23:10:25 +01:00 |
|
Laurent Destailleur
|
d7fdcc83bb
|
Fix missing search criteria
|
2016-01-12 22:03:19 +01:00 |
|
fappels
|
51b08f579b
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse
Fix Conflicts:
|
2016-01-12 13:56:00 +01:00 |
|
Laurent Destailleur
|
6648ef0064
|
Fix missing include
|
2016-01-10 12:37:56 +01:00 |
|
Laurent Destailleur
|
cc4c5873e6
|
Fix sql error
|
2016-01-10 12:37:48 +01:00 |
|
Laurent Destailleur
|
8653e7fa5c
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-01-10 00:12:51 +01:00 |
|
Juanjo Menent
|
2bb2f22955
|
Merge pull request #4252 from aspangaro/develop-a4
Accountancy Add a list to select accounting account on product card
|
2016-01-09 17:41:43 +01:00 |
|
Laurent Destailleur
|
37c106acff
|
Fix search on shipment
|
2016-01-08 23:59:02 +01:00 |
|
Laurent Destailleur
|
99f3870ee6
|
Fix no picot if no warehouse set
Fix search on warehouse
|
2016-01-08 23:54:40 +01:00 |
|
Laurent Destailleur
|
96e5651ed5
|
Fix missing field on list. Restor ability to search on supplier ref.
|
2016-01-03 14:38:47 +01:00 |
|
Laurent Destailleur
|
52cd5d505e
|
Fix several bugs on css, translation or look
|
2016-01-01 23:44:23 +01:00 |
|
Laurent Destailleur
|
ed3f0ce86b
|
Fix totalnboflines not correctly managed
|
2015-12-28 00:20:48 +01:00 |
|
Laurent Destailleur
|
6f474c403c
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
|
2015-12-27 19:15:20 +01:00 |
|
Laurent Destailleur
|
97030b05ce
|
FIX #4281
|
2015-12-27 18:20:39 +01:00 |
|
Juanjo Menent
|
cdd1641b66
|
Merge pull request #4284 from frederic34/patch-7
typo
|
2015-12-24 15:50:24 +01:00 |
|
Frédéric FRANCE
|
45b60c7800
|
typo
|
2015-12-24 00:01:05 +01:00 |
|
philippe grand
|
1eeee203d7
|
[Qual] comments should be in english
|
2015-12-22 09:37:27 +01:00 |
|
aspangaro
|
07b42f2bd5
|
Fix bug with empty code - return -1
|
2015-12-22 07:31:59 +01:00 |
|
aspangaro
|
61208537d8
|
Merge remote-tracking branch 'Upstream/develop' into develop-a4
|
2015-12-22 07:13:56 +01:00 |
|
Laurent Destailleur
|
ad5f65e988
|
Fix: use the mini image on tooltip of thirdparties
|
2015-12-21 17:32:57 +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
|
0a515ca8c0
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2015-12-21 12:38:23 +01:00 |
|
Laurent Destailleur
|
7e03aaee23
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2015-12-21 12:25:47 +01:00 |
|