Nicolas ZABOURI
|
c0bfdf4461
|
Merge remote-tracking branch 'Dolibarr/develop' into develop
|
2019-03-27 16:29:20 +01:00 |
|
Laurent Destailleur
|
9a7e6ce178
|
TakePOS Can enter payment in several times and with different modes
|
2019-03-27 16:24:44 +01:00 |
|
Laurent Destailleur
|
7990d7f018
|
Use color on the amount of the payment page of TakePOS module
FIX Use pricejs instead of toFixed to be compatible with all currencies
WIP Prepare to be able to enter different payment modes on same invoice
|
2019-03-27 16:24:44 +01:00 |
|
Laurent Destailleur
|
e064a954d2
|
Fix avoid error 500 when searching product with no criteria
|
2019-03-27 15:55:18 +01:00 |
|
Laurent Destailleur
|
11e4411400
|
TakePOS Can enter payment in several times and with different modes
|
2019-03-27 15:42:53 +01:00 |
|
ptibogxiv
|
22ea6fa0ab
|
Update api_memberstypes.class.php
|
2019-03-27 14:04:13 +01:00 |
|
ptibogxiv
|
7a84cb1fc8
|
Update type.php
|
2019-03-27 14:03:37 +01:00 |
|
Nicolas ZABOURI
|
7e169ae977
|
Merge remote-tracking branch 'Dolibarr/develop' into develop
|
2019-03-27 13:58:10 +01:00 |
|
Josep Lluís
|
3d1ebb8379
|
FIX filter by name_alias field on fetch
In fetch, when filtering by name_alias field, is used a wrong name of field (nom_alias)
|
2019-03-27 13:41:29 +01:00 |
|
ptibogxiv
|
3723da43ca
|
Update 9.0.0-10.0.0.sql
|
2019-03-27 12:50:16 +01:00 |
|
ptibogxiv
|
63ad6b779a
|
Update llx_adherent_type.sql
|
2019-03-27 12:49:26 +01:00 |
|
ptibogxiv
|
fa302db84f
|
Update adherent_type.class.php
|
2019-03-27 12:48:18 +01:00 |
|
ptibogxiv
|
2e9badd21d
|
Update api_memberstypes.class.php
|
2019-03-27 12:45:33 +01:00 |
|
ptibogxiv
|
aa28079e78
|
NEW morphy value in member type
add value: mor / phy / both(aka null)
|
2019-03-27 12:42:31 +01:00 |
|
Laurent Destailleur
|
487be34ab8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-03-27 12:40:47 +01:00 |
|
Laurent Destailleur
|
ec0733d202
|
Use color on the amount of the payment page of TakePOS module
FIX Use pricejs instead of toFixed to be compatible with all currencies
WIP Prepare to be able to enter different payment modes on same invoice
|
2019-03-27 12:40:32 +01:00 |
|
Christophe Battarel
|
00dfa86d74
|
Revert "memorize line before delete (for triggers)"
This reverts commit f45239c2a9.
|
2019-03-27 12:09:28 +01:00 |
|
Christophe Battarel
|
f45239c2a9
|
memorize line before delete (for triggers)
|
2019-03-27 12:03:00 +01:00 |
|
ptibogxiv
|
2cc9b61a9f
|
Update html.form.class.php
|
2019-03-27 11:10:30 +01:00 |
|
ptibogxiv
|
2c71b98d0d
|
NEW automatic / manual selector form
|
2019-03-27 11:05:43 +01:00 |
|
Christophe Battarel
|
c9b321ded4
|
add global conf to createfromclone
|
2019-03-27 10:32:40 +01:00 |
|
Christophe Battarel
|
f1548bd253
|
fix objfrom
|
2019-03-27 10:27:08 +01:00 |
|
Christophe Battarel
|
9efb1b9525
|
copy internal and external contacts when cloning like in propal
|
2019-03-27 10:09:45 +01:00 |
|
Christophe Battarel
|
1b9cdd021a
|
test constant for keeping customer ref on clone of order like in propal
|
2019-03-27 10:00:29 +01:00 |
|
atm-greg
|
83d7750274
|
FIX missing hook completeTabsHead in margins module
|
2019-03-27 09:33:51 +01:00 |
|
David Beniamine
|
a9db67e6e3
|
Merge branch 'develop' into NegativeBills
|
2019-03-26 23:59:10 +01:00 |
|
Laurent Destailleur
|
661a984b8e
|
Merge pull request #10880 from altatof/condpay
allow empty value for payment conditions like in orders
|
2019-03-26 20:53:20 +01:00 |
|
Laurent Destailleur
|
fb30b9bb82
|
Fix compatibility with old version and with setup of other POS modules
|
2019-03-26 20:51:38 +01:00 |
|
Laurent Destailleur
|
7b8443c350
|
Fix trans
|
2019-03-26 20:34:09 +01:00 |
|
Laurent Destailleur
|
5cc1901cec
|
Merge pull request #10913 from Tetras-Libre/PaiementsModes
Use any dolibarr enabled paiement mode in TakePOS
|
2019-03-26 20:26:32 +01:00 |
|
Laurent Destailleur
|
27ae740e82
|
Update pay.php
|
2019-03-26 20:13:25 +01:00 |
|
Laurent Destailleur
|
6bab56c6bb
|
Update pay.php
|
2019-03-26 20:12:32 +01:00 |
|
Laurent Destailleur
|
f902f7beeb
|
Update takepos.php
|
2019-03-26 20:10:48 +01:00 |
|
Laurent Destailleur
|
7ff51df8f3
|
Update takepos.php
|
2019-03-26 20:09:54 +01:00 |
|
Laurent Destailleur
|
337cb49374
|
Update invoice.php
|
2019-03-26 20:02:18 +01:00 |
|
Laurent Destailleur
|
573bc3187d
|
Update invoice.php
|
2019-03-26 20:01:06 +01:00 |
|
Laurent Destailleur
|
5c0f0eb545
|
Update setup.php
|
2019-03-26 19:55:05 +01:00 |
|
Laurent Destailleur
|
430f2c10b4
|
Update setup.php
|
2019-03-26 19:52:19 +01:00 |
|
Laurent Destailleur
|
4b378a8d4b
|
Merge branch 'develop' into PaiementsModes
|
2019-03-26 19:45:39 +01:00 |
|
Laurent Destailleur
|
a34f4c2806
|
Merge pull request #10909 from IonAgorria/fix-line-dates
FIX: Disallow line start date after end date
|
2019-03-26 19:43:11 +01:00 |
|
Laurent Destailleur
|
5fce500040
|
Merge pull request #10914 from grandoc/develop
Translation
|
2019-03-26 19:32:20 +01:00 |
|
Laurent Destailleur
|
259235deae
|
Update card.php
|
2019-03-26 19:32:13 +01:00 |
|
Laurent Destailleur
|
e7dea3cfe7
|
Merge pull request #10911 from leangjia/develop
Add China regions.
|
2019-03-26 19:23:08 +01:00 |
|
Laurent Destailleur
|
24af5cfab5
|
Merge pull request #10912 from Tetras-Libre/VATGrouped
TakePOS tickets : Grouped VAT
|
2019-03-26 19:22:40 +01:00 |
|
Laurent Destailleur
|
d8212d84df
|
Debug emailcollector
|
2019-03-26 19:15:18 +01:00 |
|
Laurent Destailleur
|
f991d4ba99
|
Fix typo
|
2019-03-26 18:10:28 +01:00 |
|
Laurent Destailleur
|
4c4ad0548d
|
Fix for creation of index composed with type
|
2019-03-26 17:56:46 +01:00 |
|
Laurent Destailleur
|
aad3867b9b
|
Fix translation
|
2019-03-26 14:00:01 +01:00 |
|
Laurent Destailleur
|
9eaef2ce7a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/export.php
htdocs/langs/en_US/admin.lang
|
2019-03-26 12:40:36 +01:00 |
|
Laurent Destailleur
|
29fe65ed75
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-26 12:37:21 +01:00 |
|