Commit Graph

75768 Commits

Author SHA1 Message Date
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
Laurent Destailleur
e5f54bd14c FIX Remane of project 2019-03-26 12:35:44 +01:00
Philippe GRAND
869a585913 fix : typo 2019-03-26 12:33:41 +01:00
Philippe GRAND
3509a240b1 fix : typo 2019-03-26 12:32:58 +01:00
Philippe GRAND
c15aa45cdb fix : typo 2019-03-26 12:32:32 +01:00
Philippe GRAND
6c1ee52ac6 fix : typo 2019-03-26 12:31:56 +01:00
Philippe GRAND
2dd4ac54a3 fix : typo 2019-03-26 12:30:17 +01:00
Laurent Destailleur
1787b31932 FIX setup of module export 2019-03-26 12:18:28 +01:00
Philippe GRAND
012de4c7c4 Merge remote-tracking branch 'upstream/develop' into develop 2019-03-26 12:15:47 +01:00
Laurent Destailleur
524f171168 FIX old export models was not visible 2019-03-26 12:12:16 +01:00
Laurent Destailleur
12c5844065 Look and feel v10 2019-03-26 11:55:22 +01:00
David Beniamine
ed81d35e38
Allow negative bills 2019-03-25 18:07:30 +01:00
David Beniamine
fa157a81b9
Merge branch 'PaiementsModes' of github.com:Tetras-Libre/dolibarr into PaiementsModes 2019-03-25 16:58:02 +01:00
David Beniamine
32303bbe48
SQL modifications for multicompany compatibility
Thanks to hregis
2019-03-25 16:49:33 +01:00
Laurent Destailleur
c62d147c60 Auto clean search field to avoid to have 2 conflict search criteria 2019-03-25 16:47:20 +01:00
Laurent Destailleur
513ef1e727 Fix label short 2019-03-25 16:16:08 +01:00
Frédéric FRANCE
f9c1289a5b
Update EBP export
@aspangaro @Darkjeff can you confirm that montant must be always >0 (in case of credit)
2019-03-25 14:52:30 +01:00
Philippe GRAND
aeff3fc4f0 Merge remote-tracking branch 'upstream/develop' into develop 2019-03-25 14:45:00 +01:00
Philippe GRAND
e2e27dad37 translation 2019-03-25 14:42:44 +01:00
Christophe Battarel
3280c8fa64 not for invoice 2019-03-25 10:12:23 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
82381533dd Better responsive 2019-03-25 09:14:28 +01:00