lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
67,974 Commits 43 Branches 150 Tags 886 MiB
b86d54cab3
Commit Graph

67974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d1d8494666 FIX Missing extrafields in export 2018-05-23 17:48:18 +02:00
Frédéric FRANCE
1b69c2357f
typo 2018-05-23 17:16:58 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty 2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES 2018-05-23 17:05:08 +02:00
Raphaël Doursenaud
be78c37985
Fix typo 2018-05-23 11:37:12 +02:00
Marc de Lima Lucio
111f3a9649 FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts 2018-05-23 11:11:33 +02:00
All3kcis
4bfd8b5539
Add oldcopy on productlot::update() 2018-05-23 10:38:24 +02:00
ATM-Nicolas
734ecbc9b5 FIX : Fetch shipping will now fetch project id 2018-05-23 09:47:29 +02:00
Laurent Destailleur
f58e0d3bcf Fix scrutinizer errors 2018-05-23 08:24:20 +02:00
Laurent Destailleur
a1c799507a Fix $contactobject not always defined 2018-05-23 08:16:24 +02:00
Laurent Destailleur
d072c2eb5d Fix turnover invoiced by vat rate and country. Use fiscal month start. 2018-05-22 23:09:27 +02:00
Laurent Destailleur
354198b31e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/contact.php
 2018-05-22 20:26:09 +02:00
Laurent Destailleur
f074daae48 Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT 2018-05-22 20:17:31 +02:00
Laurent Destailleur
2a579b707a FIX javascript showempty error 
FIX Contact tab not visible when using canvas
 2018-05-22 19:43:28 +02:00
Laurent Destailleur
be21405d21 Fix missing error message 2018-05-22 19:24:56 +02:00
Neil Orley
15e02c7082 NEW : adds billing contacts ids to REST API returns 
adds billing contacts ids to REST API returns for proposals, orders and invoices
 2018-05-22 11:40:32 +02:00
dtix
cca1d26943
Romanian chart of account added 2018-05-22 11:23:59 +03:00
dtix
63e056064e
Create llx_accounting_account_ro.sql 2018-05-22 11:22:04 +03:00
wdammak
1f43882bb7
Add liste_modeles to warehouse module 2018-05-22 01:09:52 +01:00
Laurent Destailleur
3c4c48c331 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 23:43:58 +02:00
Laurent Destailleur
7fce02e72e Fix phpunit test name 2018-05-21 23:43:26 +02:00
Laurent Destailleur
745aa4bd73 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 23:38:46 +02:00
Laurent Destailleur
8951c4a7a5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-21 23:36:47 +02:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
Laurent Destailleur
afa57fd66d Fix syntax error 2018-05-21 23:33:20 +02:00
Laurent Destailleur
69141c9493 Fix PSR True->true and GETPOST file name for local checksum check 2018-05-21 22:24:27 +02:00
Laurent Destailleur
e5561ecdfb Remove useless files 2018-05-21 22:14:15 +02:00
Laurent Destailleur
1b20ec05d1 Save translation 2018-05-21 19:37:47 +02:00
Laurent Destailleur
c141c3ecfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 19:35:26 +02:00
Laurent Destailleur
05c2f206ff Fix missing lang 2018-05-21 19:35:12 +02:00
bgenere
227539d647 FIX : showOptionals function is now consistent with template 
Extrafield_view.tpl.php for date and datetime fields

The jdate function is not called when not needed.
 2018-05-21 16:55:35 +02:00
Marc de Lima Lucio
c9222adf6d FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods 2018-05-21 16:22:06 +02:00
florian HENRY
dd946dd197 add ressource 2018-05-21 11:03:48 +02:00
florian HENRY
f5c245cd19 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_fixproject 2018-05-21 10:59:10 +02:00
florian HENRY
22cdbffb0a new : add adv targt emailing amdin with main feature level 1 2018-05-21 10:58:16 +02:00
Sean Wang
8e397b772f Fix sql error 2018-05-21 14:19:41 +08:00
Alexandre SPANGARO
4d3ce7a3d6 Fix buttons 2018-05-20 14:08:47 +02:00
Alexandre SPANGARO
3fd55585b7 Salaries : Move to LoadLangs 2018-05-20 08:00:42 +02:00
Alexandre SPANGARO
c41a9291f1 Fix some problems & presentation 2018-05-20 07:46:02 +02:00
Alexandre SPANGARO
a4d3c4bed0 Fix language 2018-05-20 06:16:12 +02:00
Alexandre SPANGARO
0b581fc507 loadLangs 2018-05-19 08:06:52 +02:00
Alexandre SPANGARO
1af4a857be Remove old code 2018-05-19 08:06:24 +02:00
Alexandre SPANGARO
e2665bd30e NEW : Accountancy Add import on general ledger 2018-05-19 07:29:17 +02:00
wdammak
5fef8c2dc1
Add generateDocument function to entrepot class 2018-05-18 14:59:42 +01:00
gauthier
4c3f9d6d5e FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url 2018-05-18 15:20:16 +02:00
florian HENRY
986b4f78ba fix eldy comment 2018-05-18 13:54:07 +02:00
BENKE Charlene
24d353c9a7 inversion of dateo and datee 2018-05-18 12:24:44 +02:00
Laurent Destailleur
e01d9a62bc
Merge pull request #8776 from defrance/patch-114 
FIX : inversion of dateo and datee
 2018-05-18 12:21:58 +02:00
Laurent Destailleur
429efcc979
Merge pull request #8772 from wdammak/patch-2 
Documents generes movement warehouse
 2018-05-18 12:20:58 +02:00
Laurent Destailleur
f211cfaf0c
Merge pull request #8777 from grandoc/new_branch_11_05_2018 
clean and update code
 2018-05-18 12:20:22 +02:00