Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 16:01:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

6072 Commits

Author SHA1 Message Date
florian HENRY
f0622139ff NEW : Add workflow to classifed propal bill on invoice validation 2016-08-04 09:55:16 +02:00
Laurent Destailleur
216ec6ac4b Label week too long with some language 2016-08-02 23:33:31 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
edbd92ee3e NEW Option SUPPLIER_ORDER_SHOW_FIRST_SALES_REP shows name of buyer on PO 2016-08-01 11:16:22 +02:00
aspangaro
4a0eb496fa Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36 
Conflicts:
	htdocs/societe/rib.php
 2016-08-01 07:27:49 +02:00
aspangaro
30ec33f152 Missing key language 2016-08-01 06:45:00 +02:00
Laurent Destailleur
0414f09e48 Fix permissions 2016-07-30 21:09:30 +02:00
Laurent Destailleur
a87c2f9579 Fix several fixes on margin reports 2016-07-30 18:57:26 +02:00
Laurent Destailleur
e5583f1544 Fix bad translation. Confusionbetween internal tranfert and bank 
tranfert for payements
 2016-07-30 17:28:18 +02:00
Laurent Destailleur
857de64607 Fix multicurrency 2016-07-30 16:41:10 +02:00
Laurent Destailleur
a6147ee73b Miscellaneous fixes 2016-07-30 14:49:29 +02:00
Laurent Destailleur
b3dab8a6f7 Better translation 2016-07-30 11:56:22 +02:00
Laurent Destailleur
ff9d6ce02a Fix missing translation 2016-07-29 23:02:40 +02:00
aspangaro
20144c9883 FIX Accountancy - Problem with the manage of the zero at the end of an accounting account in dolibarr for somes countries. Add an option. 2016-07-29 07:32:55 +02:00
Regis Houssin
6bf655c882 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 
Conflicts:
	htdocs/societe/class/societe.class.php

Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb
 2016-07-28 09:53:10 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
3b1d6818b8 Update ldap translation 2016-07-27 17:26:04 +02:00
Laurent Destailleur
4d1885eb59 Fix: restore logout and logged translation key 2016-07-27 17:00:14 +02:00
Laurent Destailleur
e747c39809 Add test on curl prerequisite. Remove test on GD lib. 2016-07-27 16:52:02 +02:00
Laurent Destailleur
3d2dc3c66e NEW Each user can select its landing page. 2016-07-26 21:12:52 +02:00
Laurent Destailleur
a167d56d5a Hard code a warning to avoid confusion. 2016-07-26 16:40:37 +02:00
Juanjo Menent
0459c6f682 Merge pull request #5545 from GPCsolutions/develop-orderinterfix 
Fix: Fixed interventions from order.
 2016-07-26 12:01:09 +02:00
Laurent Destailleur
f0a3a5ce02 NEW Mutualize mass action. So "Send by email" is also avavilable on 
orders.
 2016-07-25 21:50:41 +02:00
Regis Houssin
4b8f42949c # WARNING: head commit changed in the meantime 
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
 2016-07-25 21:05:11 +02:00
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00
Raphaël Doursenaud
052a11a5c0 Fixed interventions from order. 
Handling of predefined services was buggy and resulted in an SQL error
because of uninitialized duration.

Generalized services duration handling and exposed it in the module's
admin page.
 2016-07-25 17:24:57 +02:00
Marcos García de La Fuente
b1c552ee9d Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/install/mysql/tables/llx_product_attribute.key.sql
#	htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
 2016-07-24 11:54:38 +02:00
Marcos García de La Fuente
c082505021 NEW Added product attributes feature 2016-07-24 11:27:52 +02:00
Laurent Destailleur
867a0072e3 Fix forcing on module setup was not working 2016-07-23 13:20:34 +02:00
Laurent Destailleur
1b9b4395b9 Fix lost translation keys 2016-07-23 13:07:34 +02:00
Laurent Destailleur
08d23b482b NEW Introduce mass action "delete" on sales orders. 2016-07-23 12:17:47 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
73aeb9fcce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-21 17:25:45 +02:00
Laurent Destailleur
b5334b47bd Code comment. Add missing translation keyword 2016-07-21 16:22:43 +02:00
Laurent Destailleur
93bb929219 Merge pull request #5405 from atm-florian/dev_new_password_extrafeilds_type 
NEW : Add new password extrafields type
 2016-07-21 14:01:07 +02:00
Laurent Destailleur
2600b28638 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-21 10:40:29 +02:00
Laurent Destailleur
9f61fc4f5e Better translation 2016-07-21 10:40:13 +02:00
Laurent Destailleur
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
 2016-07-21 10:30:51 +02:00
Laurent Destailleur
9ebe704506 Merge pull request #5422 from atm-alexis/FIX_3.9_bug_5128 
FIX #5128 if create method return duplicated code error
 2016-07-21 09:55:26 +02:00
Laurent Destailleur
a290757d2d Merge pull request #5355 from atm-gauthier/NEW_allow_paiement_on_several_companies_bills_with_same_parentcompany 
NEW Option to allow payment on bills of different companies (with same parent company)
 2016-07-20 19:34:51 +02:00
Raphaël Doursenaud
f2a479695e New: Improved forced install process 
Tamper proofed the process by not relying on POST values for forced fields.
Disabled all fields set when $force_install_noedit is set.
Added a full-featured forced install config file template.

On the side:
Improved Dolibarr root and url detection.
Prevent install locking if install was not successful.
Added missing translation on failed administrator creation.
Better escaping of posted values.
 2016-07-20 14:22:35 +02:00
Laurent Destailleur
5e654e8cb3 Fix help 2016-07-18 11:49:34 +02:00
aspangaro
90a84335ab Fix: Missing key language on home for boxes 2016-07-17 07:34:19 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Laurent Destailleur
4b854fb33d Fix better error message when possible refering objects list is empty. 2016-07-16 14:37:35 +02:00
Laurent Destailleur
97b03e225b NEW Add option "Stock can be negative". Off by default. 2016-07-15 19:57:35 +02:00
Laurent Destailleur
7263b29cb4 Merge pull request #5301 from atm-ph/fix_develop_issue_2858 
NEW issue 2858 - Option to allow negative transfer
 2016-07-15 18:15:20 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-07-15 17:05:12 +02:00
Laurent Destailleur
f256de323e Fix management of preview for website module 2016-07-14 13:03:37 +02:00
Laurent Destailleur
914d56bb1b Fix css for last chrome versions. max-width: 0 fails on box 2016-07-09 16:54:04 +02:00