Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
78,589 Commits 36 Branches 189 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

17660 Commits

Author SHA1 Message Date
ptibogxiv
13c93ba1c2 transfert from html.form.class.php 2019-03-31 19:26:40 +02:00
ptibogxiv
1a228ed95c transfert to html.otherform.class.php 2019-03-31 19:25:45 +02:00
Laurent Destailleur
d572a9258c Merge branch 'develop' into new_evol_time_spent_views 2019-03-31 19:12:27 +02:00
Laurent Destailleur
ce62e7f7ec Merge pull request #10939 from OPEN-DSI/new-exports-fields 
New add fields in contact export
 2019-03-31 19:00:16 +02:00
Laurent Destailleur
29e0c98185 Merge pull request #10934 from aspangaro/10.0_product_account 
NEW: Add import of accounting account for intra/export selling on product card
 2019-03-31 18:50:15 +02:00
Laurent Destailleur
039e6034d1 Merge pull request #10936 from aspangaro/10.0_WARNING 
LOG_WARNING on function dol_print_date with deprecated value
 2019-03-31 18:45:01 +02:00
Laurent Destailleur
4233307384 Merge pull request #10946 from frederic34/patch-4 
phpcs fix
 2019-03-31 18:41:22 +02:00
Laurent Destailleur
0d564cdd6c Merge pull request #10919 from grandoc/new_branch_26_03_2019 
New branch 26 03 2019
 2019-03-31 18:23:05 +02:00
Laurent Destailleur
ecd049b4e6 Debug dolistore 2019-03-31 13:39:51 +02:00
Frédéric FRANCE
ddd1c04eae phpcs fix 2019-03-31 09:27:11 +02:00
Laurent Destailleur
fca404e8d5 Show price without tax to prepare tax per customer country. 2019-03-30 19:30:58 +01:00
Laurent Destailleur
be21755378 Add page id to help debug in header 2019-03-29 23:04:09 +01:00
Laurent Destailleur
26e3f41f73 Translation 2019-03-29 16:18:47 +01:00
Laurent Destailleur
697a2e5576 Show time to bill and billed in list of tasks 2019-03-29 14:34:55 +01:00
Lionel VESSILLER
a52935f6e4 New add fields in contact export 
- thirdparty fields (address, phone, email, typent)
- contact field (status)
 2019-03-28 18:29:36 +01:00
Alexandre SPANGARO
8163739a68 LOG_WARNING on function dol_print_date with deprecated value 2019-03-28 12:03:04 +01:00
Alexandre SPANGARO
9f9dd2cd30 NEW: Add import of accounting account for intra/export selling on product card 2019-03-28 11:41:59 +01:00
Laurent Destailleur
3930464b84 Clean code and debug TakePOS module 2019-03-27 17:50:23 +01:00
Laurent Destailleur
11e4411400 TakePOS Can enter payment in several times and with different modes 2019-03-27 15:42:53 +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
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
Laurent Destailleur
d8212d84df Debug emailcollector 2019-03-26 19:15:18 +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
Philippe GRAND
2dd4ac54a3 fix : typo 2019-03-26 12:30:17 +01:00
Laurent Destailleur
524f171168 FIX old export models was not visible 2019-03-26 12:12:16 +01:00
Laurent Destailleur
513ef1e727 Fix label short 2019-03-25 16:16:08 +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
Laurent Destailleur
a950d8389e WIP Attach document to expense report lines 2019-03-24 20:22:05 +01:00
markus
f942917f53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-24 17:42:49 +01:00
Laurent Destailleur
b2eee520df Fix phpcs 2019-03-24 16:11:12 +01:00
Laurent Destailleur
152c27139f Doc 2019-03-24 14:54:04 +01:00
Laurent Destailleur
614b4afeb0 NEW The preview of PDF files generates 1 png file even if several pages. 2019-03-24 14:53:26 +01:00
Laurent Destailleur
949ef79227 Better error message 2019-03-24 14:26:16 +01:00
Laurent Destailleur
fad6efd86c WIP file attachment on expense report lines 2019-03-24 13:27:26 +01:00
Laurent Destailleur
5ff76e2c13 WIP file attachment on expense report lines 2019-03-24 12:15:19 +01:00
Laurent Destailleur
20f3af066c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/clients.php
 2019-03-23 22:44:14 +01:00
Laurent Destailleur
79ed4bc80b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-03-23 22:36:04 +01:00
Laurent Destailleur
3ede626932 FIX If we build one invoice for several orders, we must put the ref of 
order on the line to not lose information.

Conflicts:
	htdocs/commande/list.php
	htdocs/core/actions_massactions.inc.php
 2019-03-23 22:34:10 +01:00
Laurent Destailleur
5666fbedac FIX If we build one invoice for several orders, we must put the ref of 
order on the line to not lose information.
 2019-03-23 22:30:52 +01:00
Laurent Destailleur
df9e121ac6 Enhance the module debugbar. Do not scan the log anymore. 2019-03-23 14:37:54 +01:00
Laurent Destailleur
05c2ae6778 Remove warnings 2019-03-23 12:36:05 +01:00
Laurent Destailleur
ea010b9e01 Fix reduce side effects of debugbar 2019-03-23 12:15:42 +01:00
Laurent Destailleur
c569e71bc8 Fix remove warnings 2019-03-23 12:04:50 +01:00
Laurent Destailleur
cd6a0bacdd Look and feel v10 2019-03-22 14:32:15 +01:00
Laurent Destailleur
d79d5d5a23 Fix var name not defined 2019-03-22 13:20:37 +01:00
Laurent Destailleur
28fede950f Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into 
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
 2019-03-22 13:00:48 +01:00
Laurent Destailleur
1b558d70c1 Fix menu translation 2019-03-22 12:42:23 +01:00
Laurent Destailleur
52d3e89276 FIX function not found 2019-03-22 12:21:31 +01:00