Frédéric FRANCE
|
bc58641828
|
Update Invoice Preview to be like order and propal preview
|
2014-11-27 22:07:18 +01:00 |
|
Laurent Destailleur
|
60e5369db2
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/bookmarks/card.php
|
2014-11-27 22:01:02 +01:00 |
|
Frédéric FRANCE
|
755732ce58
|
Update apercu.php
|
2014-11-26 20:35:08 +01:00 |
|
Frédéric FRANCE
|
96e0ecd1a7
|
Update Invoice Preview
|
2014-11-26 20:07:47 +01:00 |
|
Francis Appels
|
b1a4b8e7d0
|
Fix: [ bug #1624 ] POS set buy price for margin
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
|
2014-11-25 21:20:13 +01:00 |
|
aspangaro
|
c4c69e191b
|
Replace <center> tags
|
2014-11-25 20:13:43 +01:00 |
|
Frédéric FRANCE
|
fbdd851875
|
Fix remove </a> not needed
|
2014-11-25 18:54:56 +01:00 |
|
Laurent Destailleur
|
6d2e024d52
|
Doxygen
|
2014-11-23 17:53:44 +01:00 |
|
Laurent Destailleur
|
3f655154c5
|
Merge pull request #2083 from frederic34/patch-2
Fix Typo
|
2014-11-23 17:47:43 +01:00 |
|
Frédéric FRANCE
|
979d6dffa2
|
Update /compta/paiement/cheque/list.php
|
2014-11-23 17:45:18 +01:00 |
|
Frédéric FRANCE
|
339415034e
|
Update /compta/facture/impayees.php
|
2014-11-23 17:44:45 +01:00 |
|
Frédéric FRANCE
|
ccff0f0952
|
Update /compta/facture/list.php
|
2014-11-23 17:44:41 +01:00 |
|
Frédéric FRANCE
|
9b731753e7
|
Update /compta/salaries/index.php
|
2014-11-23 17:44:37 +01:00 |
|
Frédéric FRANCE
|
fa89e310ae
|
Update /compta/paiement/list.php
|
2014-11-23 17:44:33 +01:00 |
|
Frédéric FRANCE
|
dd1c39b44e
|
Update /compta/bank/search.php
|
2014-11-23 17:44:29 +01:00 |
|
Frédéric FRANCE
|
2a79c2c826
|
Update /compta/sociales/index.php
|
2014-11-23 17:44:25 +01:00 |
|
Frédéric FRANCE
|
59494db8c1
|
Update /compta/tva/reglement.php
|
2014-11-23 17:44:21 +01:00 |
|
Frédéric FRANCE
|
8c839cc2a1
|
Update /compta/prelevement/list.php
|
2014-11-23 17:44:16 +01:00 |
|
Frédéric FRANCE
|
68ccb33def
|
Update /compta/deplacement/list.php
|
2014-11-23 17:44:13 +01:00 |
|
Frédéric FRANCE
|
045c2f9568
|
Update /compta/dons/list.php
|
2014-11-23 17:44:08 +01:00 |
|
Frédéric FRANCE
|
326e009cad
|
Fix Typo
|
2014-11-23 17:42:06 +01:00 |
|
Laurent Destailleur
|
652b0f84a7
|
Fixed: Field is used only by module accounting so must have a condition
on it.
|
2014-11-23 17:03:22 +01:00 |
|
Laurent Destailleur
|
671243e8f6
|
Fixed: Bugs reported by scrutinizer
Fixed: Solve conflict between ->iban and ->iban_prefix.
|
2014-11-22 16:57:08 +01:00 |
|
Laurent Destailleur
|
d8767bfbae
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/class/product.class.php
|
2014-11-22 16:10:14 +01:00 |
|
Laurent Destailleur
|
9aab62ab36
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2014-11-22 16:03:09 +01:00 |
|
Laurent Destailleur
|
eaa4b6cb56
|
Add PR manually because of conflict "#1678 & #1677 Untranslatable token"
|
2014-11-22 15:37:18 +01:00 |
|
Laurent Destailleur
|
d6f47227fe
|
Fixed: [ bug #1646 ] Can't list unpaid invoices
|
2014-11-22 15:09:54 +01:00 |
|
Laurent Destailleur
|
5acdce0b9f
|
Fixed: [ bug #1647 ] Can't list tax payments
|
2014-11-21 23:52:12 +01:00 |
|
Laurent Destailleur
|
ce98036725
|
Fixed: [ bug #1648 ] Can't see turnover report by product/services
|
2014-11-21 23:45:56 +01:00 |
|
Laurent Destailleur
|
80e62697f0
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/bank/treso.php
|
2014-11-18 19:01:01 +01:00 |
|
aspangaro
|
31b90cf383
|
Add 1st version of calculator but need work
|
2014-11-17 06:38:06 +01:00 |
|
Laurent Destailleur
|
01279edfc8
|
Fixed: [ bug #1570 ] Negative supplier invoices do not appear in bank
planned transactions.
|
2014-11-16 16:36:32 +01:00 |
|
aspangaro
|
c256243bf7
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2014-11-16 08:41:39 +01:00 |
|
Laurent Destailleur
|
c186f13218
|
Fix: Param $action was not defined.
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
|
2014-11-15 19:04:21 +01:00 |
|
Laurent Destailleur
|
445f696d28
|
Fix: Pb of object with wrong type.
|
2014-11-15 18:24:38 +01:00 |
|
Laurent Destailleur
|
d98bfb1d8d
|
Fix: Bugs reported by scrutinizer
|
2014-11-15 15:19:37 +01:00 |
|
Christophe Battarel
|
7ed496d7d9
|
FIX: copy extrafields when creating order from propale and creating
invoice from order
|
2014-11-12 17:51:26 +01:00 |
|
aspangaro
|
c70539b3b2
|
Bug & merge
|
2014-11-12 07:33:03 +01:00 |
|
aspangaro
|
a55afd4f50
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2014-11-12 07:32:32 +01:00 |
|
Florian HENRY
|
9c795d2c4b
|
Finnish bank extrafeilds
|
2014-11-10 13:18:27 +01:00 |
|
Florian HENRY
|
e9f754395d
|
Start bank extrafields
|
2014-11-10 13:09:58 +01:00 |
|
aspangaro
|
3042bf4dc2
|
Correct lot of bugs
|
2014-11-10 06:08:50 +01:00 |
|
Laurent Destailleur
|
29298c73b9
|
Fix: Must show limit into list
|
2014-11-09 19:16:22 +01:00 |
|
aspangaro
|
9c3fa5a9eb
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2014-11-09 07:26:14 +01:00 |
|
Laurent Destailleur
|
6fd89c4b41
|
Fix: Missing translation
|
2014-11-08 20:05:56 +01:00 |
|
Laurent Destailleur
|
6762b98c00
|
Minor look enhancement during debug
|
2014-11-07 23:25:39 +01:00 |
|
aspangaro
|
840dfd780d
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2014-11-07 21:28:39 +01:00 |
|
Drosis Nikos
|
24439eb1a3
|
Fix : tva not coming from multiprice
|
2014-11-07 15:31:06 +02:00 |
|
aspangaro
|
16126891a6
|
Merge remote-tracking branch 'Upstream/develop' into develop-search
|
2014-11-06 06:41:09 +01:00 |
|
aspangaro
|
89296e3011
|
Typo search list
|
2014-11-05 22:27:26 +01:00 |
|