lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,285 Commits 43 Branches 150 Tags 886 MiB
4b4dcf2e01
Commit Graph

52328 Commits

Author SHA1 Message Date
Laurent Destailleur
e1ba69eee0 Fix edit of automatic event should keep its type. 2017-07-08 00:19:30 +02:00
Laurent Destailleur
fbca244212 Fix must go back to next version 2017-07-07 23:19:15 +02:00
Laurent Destailleur
eff4282cc2 Clean files 2017-07-07 22:19:01 +02:00
Laurent Destailleur
5ad6d70397 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 22:05:01 +02:00
Laurent Destailleur
4bae65bedc Fix travis 2017-07-07 22:04:29 +02:00
Laurent Destailleur
efd292e8f5 Merge pull request #7126 from atm-gauthier/FIX_add_contact 
FIX : we have to check if contact doesn't already exist on add_contact
 2017-07-07 20:33:24 +02:00
Laurent Destailleur
1d35c87c18 Merge pull request #7125 from aspangaro/6.0-fec3 
Fix some problems
 2017-07-07 20:32:27 +02:00
Laurent Destailleur
34d0c79e32 Merge pull request #7124 from fappels/develop_updateline_notriggerflag 
New add trigger disable to updateline functions
 2017-07-07 20:30:04 +02:00
Laurent Destailleur
02aa4f7e0c Fix permission to show details of project 2017-07-07 20:28:43 +02:00
Laurent Destailleur
749e5eb7f4 Fix link 2017-07-07 20:24:39 +02:00
Laurent Destailleur
0d8f382ca4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 20:16:04 +02:00
Laurent Destailleur
5046852caa Merge pull request #7121 from jfefe/patch-14 
Bad path for document file
 2017-07-07 20:15:18 +02:00
Laurent Destailleur
bd0dba6439 Update card.php 
Better fix for future
 2017-07-07 20:14:47 +02:00
Laurent Destailleur
441c4b9b71 Merge pull request #7115 from atm-florian/dev_fix_accountancy 
FIX accountancy right management on setup pages
 2017-07-07 20:08:21 +02:00
Laurent Destailleur
3270d141b0 Update index.php 2017-07-07 20:07:28 +02:00
Laurent Destailleur
5eaf49a265 Update journals_list.php 2017-07-07 20:05:32 +02:00
Laurent Destailleur
2dd9cb61a6 Update export.php 2017-07-07 20:04:29 +02:00
Laurent Destailleur
51a9c4fad5 Update defaultaccounts.php 2017-07-07 20:03:57 +02:00
Laurent Destailleur
d880c943ae Update categories_list.php 2017-07-07 20:03:39 +02:00
Laurent Destailleur
0fc6f6920e Update categories.php 2017-07-07 20:03:14 +02:00
Laurent Destailleur
bcbd2a8a91 Merge pull request #7108 from atm-ph/fix_develop_import_update 
Fix update row on xlsx import do not work as csv import
 2017-07-07 20:00:28 +02:00
Laurent Destailleur
0d575b4cdf Merge pull request #7107 from atm-john/fix_contract_card 
Fix return method
 2017-07-07 19:58:27 +02:00
Laurent Destailleur
71d360b4a0 Merge pull request #7105 from hregis/develop_bug2 
Fix: check if action type is different of 'user' (external module)
 2017-07-07 19:57:26 +02:00
Laurent Destailleur
0eb6a25342 Merge pull request #7104 from tuxgasy/develop_shipment_failed_no_error 
Fix #7103 : No error message on validate shipment if stock movement failed
 2017-07-07 19:55:32 +02:00
Laurent Destailleur
608e9e1c82 Look and feel v6 (no amount symbol into list) 2017-07-07 19:48:35 +02:00
Laurent Destailleur
552031799d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 19:42:37 +02:00
Laurent Destailleur
de24e93cca Merge pull request #7097 from fappels/develop_nbr_suppliers_prod_list 
NEW: Add column with nbr suppliers prices and WAP to product list.
 2017-07-07 19:42:25 +02:00
Laurent Destailleur
b7af0cca63 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/holiday/card.php
 2017-07-07 19:39:57 +02:00
Laurent Destailleur
aa4ff464d6 Merge pull request #7096 from fappels/6.0_fix_virtual_stock_read_rights_third_parties 
FIX: Ignore third party read rights filter for virtual stock calculation.
 2017-07-07 19:34:12 +02:00
Laurent Destailleur
a026e1d701 Close #7095 2017-07-07 19:32:03 +02:00
Laurent Destailleur
c459d3aa7a FIX user that modify not set 2017-07-07 19:23:19 +02:00
Laurent Destailleur
4b11921cb6 Merge pull request #7087 from OPEN-DSI/core_fourn_command_link_now_order_date_and_delivery_date 
FIX: In supplier order, show link Now for order date and delivery date
 2017-07-07 19:18:25 +02:00
Laurent Destailleur
0a7a092080 FIX Missing ref 2017-07-07 19:17:53 +02:00
Laurent Destailleur
fd5f992be4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-07-07 19:15:18 +02:00
Laurent Destailleur
c66f67ee80 Merge pull request #7106 from atm-ph/fix_develop_sql_migration 
Fix sql syntax
 2017-07-07 19:15:05 +02:00
Laurent Destailleur
be493b78ba Merge pull request #7093 from Darkjeff/Fix-Accoutancy 
Fix accoutancy
 2017-07-07 19:14:35 +02:00
Laurent Destailleur
4c1b485d47 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture/list.php
 2017-07-07 19:06:25 +02:00
Laurent Destailleur
c6fc7313b1 Merge pull request #7116 from atm-ph/fix_7109 
FIX 7109 - class name already exist for customer payment
 2017-07-07 19:01:10 +02:00
Laurent Destailleur
d58682c574 Merge pull request #7088 from atm-arnaud/FIX_edit_social_emptying_label 
FIX edit sociale was emptying label
 2017-07-07 18:59:10 +02:00
Laurent Destailleur
47c6a324ac Merge pull request #7086 from OPEN-DSI/core_commande_warning_delay_dashboard 
FIX: Function load_board in commande.class.php for warnings delay in dashboard
 2017-07-07 18:56:31 +02:00
Laurent Destailleur
451508ba20 Merge pull request #7084 from atm-florian/develop 
FIX Transfer between account with different currencies
 2017-07-07 18:54:03 +02:00
Laurent Destailleur
b0359b4659 Merge pull request #7081 from atm-florian/5.0 
fix class error (given by eclipse Oxygen version)
 2017-07-07 18:35:47 +02:00
Laurent Destailleur
eef027acb4 Merge pull request #7080 from atm-arnaud/FIX_holidays_postgresql 
FIX holidays postgresql search
 2017-07-07 18:31:54 +02:00
Laurent Destailleur
640f66f017 Fix SQL syntax 2017-07-07 17:34:56 +02:00
florian HENRY
1c647e2898 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2017-07-07 15:59:41 +02:00
Laurent Destailleur
252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-07 15:11:53 +02:00
Laurent Destailleur
4c0fcb2b9a Fix total with tax does not include local taxes. To solve, i show both 
totals.
 2017-07-07 14:58:57 +02:00
Laurent Destailleur
8abec461a6 Fix total with tax does not include local taxes. To solve, i show both 
totals.
 2017-07-07 12:31:00 +02:00
gauthier
a6f1e08c19 FIX : we have to check if contact doesn't already exist on add_contact() function 2017-07-07 11:48:30 +02:00
Laurent Destailleur
024c6d2c08 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 11:36:24 +02:00
Laurent Destailleur
2be9f402c6 Fix order of tab 2017-07-07 10:58:18 +02:00
Laurent Destailleur
de1a7042d4 Fix filter on list of actions 2017-07-07 10:55:42 +02:00
Laurent Destailleur
9baeee893f Fix multicurrency (tags for odt) 2017-07-07 10:54:54 +02:00
Laurent Destailleur
2aaf8b22f2 Fix substitution var 2017-07-07 10:10:12 +02:00
Alexandre SPANGARO
0797323664 Fix: Search broken in holiday list 2017-07-07 06:42:29 +02:00
Alexandre SPANGARO
d5d2b3a2fc Merge remote-tracking branch 'uptream/develop' into 6.0-fec3 2017-07-07 06:10:56 +02:00
Alexandre SPANGARO
0c5febfb4d Fix: Accountancy 2017-07-07 06:09:49 +02:00
fappels
6effcb0829 New add trigger disable to updateline functions 2017-07-06 16:26:15 +02:00
fappels
857e45baf3 Fix comment 2017-07-06 15:34:10 +02:00
jfefe
a072b23a5e FIX #7075 : bad path for document 2017-07-06 00:47:26 +02:00
phf
31b94c1d3f Fix 7109 - class name already exist for customer payment 2017-07-05 16:52:37 +02:00
Regis Houssin
c5442c3553 Fix: module "root" not exists ! (deprecated api) 2017-07-05 12:21:35 +02:00
florian HENRY
a4b1c28696 fix : accountancy right management 2017-07-05 11:33:58 +02:00
florian HENRY
1816b2249e fix class error 2017-07-05 11:24:24 +02:00
Regis Houssin
a2e2149eb2 Fix: multiple preg_match $reg confusion ! 2017-07-05 11:12:48 +02:00
florian HENRY
437b2a7290 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2017-07-05 11:01:57 +02:00
Laurent Destailleur
e7e4252244 Fix deletion of category 2017-07-05 01:23:42 +02:00
Laurent Destailleur
e199864fce Better log 2017-07-05 00:09:35 +02:00
TuxGasy
5b154946a8 fix missing error on stock mouvment with batch 2017-07-04 21:48:38 +02:00
TuxGasy
9f50882d6d fix incorrect indent 2017-07-04 21:45:38 +02:00
Laurent Destailleur
ea8a49aea3 Prepare 5.0.5 2017-07-04 17:38:20 +02:00
Laurent Destailleur
451e8fc024 FIX Support of vat code when using price per customer 2017-07-04 17:37:28 +02:00
Laurent Destailleur
c1e747fa39 Look and feel v6 2017-07-04 13:05:02 +02:00
phf
3892da7606 Fix update row on xlsx import do not work as csv import 2017-07-04 12:09:56 +02:00
Laurent Destailleur
77f5952318 Fix pgsql compatibility 2017-07-04 11:18:48 +02:00
Laurent Destailleur
95cf36c43b Fix use the getUrl function instead of hard coded curl 2017-07-04 10:55:53 +02:00
John
e1ae97e661 Fix return method 2017-07-04 10:34:59 +02:00
Laurent Destailleur
0ee93fb00c Fix conflict between option login and logina and logint in agenda export 2017-07-04 10:29:38 +02:00
phf
42183877e8 Fix sql syntax 2017-07-04 09:30:53 +02:00
Regis Houssin
d9d9b748ad Fix: check if action type is different of 'user' (external module) 2017-07-03 19:27:21 +02:00
florian HENRY
7f869b4840 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
 2017-07-03 14:36:50 +02:00
TuxGasy
c8d039508f Fix missing error message 2017-07-03 14:01:11 +02:00
Laurent Destailleur
cb1c461b69 Work on module builder 2017-07-03 12:28:52 +02:00
Laurent Destailleur
8b91f4fb5e Debug module website 2017-07-03 12:04:45 +02:00
Laurent Destailleur
9e26e6b0a3 Fix bad value for ref of old contracts 2017-07-03 11:42:17 +02:00
Laurent Destailleur
db1d97c9ac Fix bad value for ref of old contracts 2017-07-03 02:09:14 +02:00
Laurent Destailleur
8a96260892 Fix amount not filled into email confirmation 2017-07-03 01:57:28 +02:00
Laurent Destailleur
d57fe35efc Add option to fix corrupted database with bad pagecode 2017-07-03 01:36:04 +02:00
Laurent Destailleur
aa1351d483 Fix to be sure database is not created using utf8mb4 (not yet supported) 2017-07-03 01:10:09 +02:00
Laurent Destailleur
efecb32ec9 Fix migration 2017-07-03 00:11:22 +02:00
Laurent Destailleur
565de9bc8d Debug module website 2017-07-02 23:38:19 +02:00
Laurent Destailleur
b95dea3b50 Fix missing ; 2017-07-02 23:37:52 +02:00
Laurent Destailleur
c56ea50251 Currency symbol for peru is before value 2017-07-02 14:30:24 +02:00
Laurent Destailleur
4f72bd35db Fix too much code into the NOREQUIREDB 2017-07-02 13:18:23 +02:00
Laurent Destailleur
53708c138a Add option to be able to debug problem of apache lock page 2017-07-01 16:52:28 +02:00
Laurent Destailleur
a5cfd7c2e2 FIX Error when updating thirdparty not returned 2017-07-01 16:24:33 +02:00
Laurent Destailleur
c5aed0c333 Fix phpcs 2017-07-01 14:25:46 +02:00
Laurent Destailleur
7ae52d843c Look and feel v6 2017-07-01 14:23:24 +02:00
Laurent Destailleur
b186fa8759 Fix pgsql compatibility 2017-07-01 13:31:44 +02:00
Laurent Destailleur
658fe93d8c Fix menu editor (data not aligned) 2017-07-01 12:42:49 +02:00