lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66,532 Commits 43 Branches 150 Tags 886 MiB
6ced1a3264
Commit Graph

4227 Commits

Author SHA1 Message Date
Alexandre SPANGARO
a5428cc8c7 NEW Module Assets 2018-04-01 21:26:52 +02:00
Laurent Destailleur
a9ac7e1f29 Debug inventory module 2018-03-31 19:20:38 +02:00
Laurent Destailleur
b5c53e9d76
Merge pull request #8469 from ATM-Marc/NEW_product_default_warehouse 
NEW: default warehouse field for products
 2018-03-29 13:51:37 +02:00
Laurent Destailleur
6d796cfd26
Update llx_product.sql 2018-03-29 13:50:29 +02:00
Laurent Destailleur
03fe0d6b9e
Update 7.0.0-8.0.0.sql 2018-03-29 13:50:08 +02:00
Laurent Destailleur
af11daf186
Merge pull request #8467 from hregis/develop_bug3 
Fix: missing encrypt for llx_const
 2018-03-29 13:43:53 +02:00
Laurent Destailleur
6ccdb52229 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-29 13:30:22 +02:00
Laurent Destailleur
eee1cd9120 Fix data corrupted by v7 2018-03-29 13:29:23 +02:00
Laurent Destailleur
188e5d286d Fix statut 2018-03-29 13:28:29 +02:00
Marc de Lima Lucio
3646374976 NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders 2018-03-28 11:54:21 +02:00
Regis Houssin
63a5ff61ef Fix: missing encrypt for llx_const 2018-03-28 06:44:17 +02:00
Laurent Destailleur
26e2d3c4f0 Clean permissions tables 2018-03-26 16:35:50 +02:00
Laurent Destailleur
e9c4ae8f01 Add type product/service in type of expense report 2018-03-26 14:52:20 +02:00
Laurent Destailleur
6e32e9961f Syn transifex 2018-03-23 17:56:35 +01:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
Laurent Destailleur
0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-03-19 17:58:19 +01:00
Laurent Destailleur
39228f6221 South africa vat rates 2018-03-18 23:37:46 +01:00
Laurent Destailleur
8223047d4a South africa vat rates 2018-03-18 23:37:28 +01:00
Regis Houssin
c0a6ae2195 Fix: replace with dolibarr_install_syslog 2018-03-16 18:31:11 +01:00
Laurent Destailleur
545bfeedcc Minimum PHP version for 8.0 is PHP 5.4 2018-03-16 01:25:34 +01:00
Regis Houssin
6e585869c7 Fix: better method for avoid lost global 2018-03-15 19:33:08 +01:00
Regis Houssin
9f62ddaf36 Fix: missing update of $conf 2018-03-15 19:24:34 +01:00
Laurent Destailleur
c83b0bd53c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 15:11:35 +01:00
Laurent Destailleur
c4ca4a5a16 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/install/mysql/data/llx_accounting_category.sql
 2018-03-15 15:11:18 +01:00
Laurent Destailleur
c9566e9501
Merge pull request #8392 from aspangaro/8.0-a9 
NEW Add stats in salaries module
 2018-03-15 14:28:35 +01:00
Laurent Destailleur
85e307d6b8 Fix report when group is not dedicated to a country 2018-03-15 12:31:24 +01:00
Laurent Destailleur
b2e4c6cf14 Clean code 2018-03-15 11:53:47 +01:00
Laurent Destailleur
db18db9488 Clean code 2018-03-15 11:27:39 +01:00
Alexandre SPANGARO
9ce6ab915c Merge remote-tracking branch 'uptream/develop' into 8.0-a9 2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc NEW Add stats in salaries module 2018-03-15 06:23:20 +01:00
Laurent Destailleur
268b07bcf0 Can add/delete credit card localy 2018-03-14 11:51:13 +01:00
Laurent Destailleur
c78e5d23ea Work on the customer payment mode tab 2018-03-13 20:23:59 +01:00
Laurent Destailleur
944ba69cd8 Add unique key. Dolibarrize view of stripe card. 2018-03-13 17:32:49 +01:00
Laurent Destailleur
8048259733 Work on ticket module integration 2018-03-13 12:13:47 +01:00
Laurent Destailleur
5d512af4b4 Fix migration 2018-03-13 09:53:33 +01:00
ptibogxiv
d6be9651a0
ADD key_account variable for stripe or other gateway 2018-03-13 00:29:28 +01:00
Laurent Destailleur
7362b3f3d7 Add table to store thirparty account in external web sites 2018-03-12 15:59:03 +01:00
Laurent Destailleur
18b6b70f45
Merge pull request #8358 from frederic34/patch-2 
Update llx_ticketsup.sql
 2018-03-12 12:28:40 +01:00
Laurent Destailleur
98b7d4c2e2 NEW Can set the start/end date of service line in invoice templates 2018-03-12 12:27:40 +01:00
Frédéric FRANCE
98320ffad2
Update 7.0.0-8.0.0.sql 2018-03-12 08:36:18 +01:00
Frédéric FRANCE
478b3dfa42
Update llx_ticketsup.sql 2018-03-12 08:34:47 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
florian HENRY
cfdaa7c88d ticket sup make it work 2018-03-11 16:07:13 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
c1d148458b Fix migration 2018-03-09 23:44:00 +01:00
Laurent Destailleur
3ad95e46c0 Fix phpunit 2018-03-08 22:40:42 +01:00
Laurent Destailleur
489dde4db4 Prepare database to store payment modes of customers 2018-03-08 22:26:42 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
Laurent Destailleur
235db1f405 Enhance OAuth module to store the stripe account in llx_oauth_token 2018-03-08 19:51:18 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
fe45e82e99 Fix use of table llx_c_paiement (param showempty was not used/set) 2018-03-07 19:00:38 +01:00
Laurent Destailleur
78cbd92e98 Fix init data on table of payment mode 2018-03-07 18:30:39 +01:00
Laurent Destailleur
94140b04ca FIX Missing primary key on payment modes 2018-03-07 15:28:50 +01:00
Laurent Destailleur
cf45f78d7e
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency 
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
 2018-03-07 13:12:23 +01:00
Laurent Destailleur
d07cd8c04b
Update 7.0.0-8.0.0.sql 2018-03-07 13:11:18 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
Laurent Destailleur
72af963ed5 Fix triggers 2018-03-06 12:26:26 +01:00
Laurent Destailleur
a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php
 2018-03-06 09:20:45 +01:00
Marc de Lima Lucio
fad521d66c FIX: supplier disocunts: add forgotten index to migration script 2018-03-05 12:09:13 +01:00
Marc de Lima Lucio
1765b09fda Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-05 11:05:38 +01:00
Laurent Destailleur
1f67e115d7
Merge pull request #8239 from hregis/develop_bug2 
Fix: syntax error
 2018-03-02 17:45:31 +01:00
Laurent Destailleur
5d74d01f61
Merge pull request #8238 from guillaume-uH57J9/patch-1 
install, don't use innodb engine for pgsql to fix #8237
 2018-03-02 17:45:12 +01:00
florian HENRY
3490d3779b Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-02 17:31:39 +01:00
florian HENRY
473c16ede5 fix pgSQL install 2018-03-02 17:30:46 +01:00
Laurent Destailleur
b87db9d32d Fix missing ; 2018-03-02 16:38:56 +01:00
Laurent Destailleur
e073fa15f7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-02 14:00:27 +01:00
Laurent Destailleur
8d11f1efa1 FIX Payment mode not correctly set in donation and document 2018-03-02 12:32:49 +01:00
Marc de Lima Lucio
059801fe03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-01 10:22:21 +01:00
Laurent Destailleur
0c4bf2340f Fix missing primary key 2018-02-28 15:22:58 +01:00
Laurent Destailleur
e2c7585ae7 NEW Support alternative aliases of page name in website 2018-02-28 14:36:22 +01:00
Marc de Lima Lucio
7cd1b2caa9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5 NEW: supplier relative discounts 2018-02-27 16:30:39 +01:00
kkhelifa-opendsi
90f4c985f6
Merge branch 'develop' into product_supplier_buyprice_multicurrency 2018-02-26 09:54:09 +01:00
Regis Houssin
ef60d095c0 Fix: syntax error 2018-02-25 19:55:10 +01:00
guillaume-uH57J9
d8a0cb7387
install, don't use innodb engine for pgsql 2018-02-25 19:43:53 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
2cd5ed65a6 Clean deprecated (field unit_charge in supplier price) 2018-02-25 14:13:09 +01:00
Laurent Destailleur
8dceb8930f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/user/card.php
 2018-02-25 12:41:17 +01:00
Laurent Destailleur
c8078b54b5 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
 2018-02-24 12:52:57 +01:00
Laurent Destailleur
435e4823a5 Fix some warning during install 2018-02-24 11:58:09 +01:00
Laurent Destailleur
787a137509 Add column for accounting doc 2018-02-23 15:38:39 +01:00
KHELIFA
54dba24ab5 Add multicurrency support for product buy price for supplier propales, orders and invoices 2018-02-23 11:06:07 +01:00
John
b276a8186e Fix sql entity for sub query 2018-02-21 10:03:04 +01:00
Laurent Destailleur
87a3019e73 Fix upgrade missing steps 2018-02-20 06:03:22 +01:00
Laurent Destailleur
eb0073c330 Fix upgrade missing steps 2018-02-20 05:53:53 +01:00
Laurent Destailleur
31d0679876 Add data 2018-02-19 19:52:51 +01:00
Laurent Destailleur
1ee128ff13 NEW Add type of website container/page into dictionary 2018-02-19 19:48:53 +01:00
Marc de Lima Lucio
e2b65b3755 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note 2018-02-16 09:14:53 +01:00
Laurent Destailleur
f1a9f81fb4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-14 22:19:59 +01:00
Laurent Destailleur
7f8cbc0f62 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php
 2018-02-14 22:08:18 +01:00
Marc de Lima Lucio
daca27b2ed NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring 2018-02-14 18:02:40 +01:00
Laurent Destailleur
ca71d90d96 Fix help 2018-02-14 14:57:53 +01:00
Laurent Destailleur
9f883f3401 Fix install log disappeared 2018-02-14 14:50:22 +01:00
Regis Houssin
fa2fddcdc1 Fix: Update entity field in llx_user_rights and llx_usergroup_rights 2018-02-14 14:30:39 +01:00
Laurent Destailleur
7bdf335a8e Add a fix to clean data 2018-02-14 14:26:33 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
475b89bac1
Merge branch 'develop' into new_order_min_amount 2018-02-08 14:20:53 +01:00
Laurent Destailleur
f251113f69 Fix accounting module with multicompany 2018-02-06 01:00:35 +01:00
Laurent Destailleur
0cc6654b06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:25:00 +01:00