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

48769 Commits

Author SHA1 Message Date
Laurent Destailleur
f1ec2c04ed Uniformize code 2016-10-28 18:40:26 +02:00
Laurent Destailleur
22d2557a48 Clean page 2016-10-28 18:05:46 +02:00
Laurent Destailleur
d866ef66c3 Fix label in title 2016-10-28 17:48:30 +02:00
Laurent Destailleur
220d81b350 Fix duplicate tooltips 2016-10-28 17:43:29 +02:00
Laurent Destailleur
223047cdf5 Uniformize look and feel on stock movement 2016-10-28 16:05:33 +02:00
Regis Houssin
d0bd1d5d36 Fix: missing path of user photo 2016-10-28 14:22:06 +02:00
Laurent Destailleur
5654a4609e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-28 12:00:46 +02:00
Laurent Destailleur
6938b05219 Mutualize code to show files generated for mass actions 2016-10-28 12:00:30 +02:00
Juanjo Menent
a59cf0e13b Merge pull request #5935 from aspangaro/5.0-p32 
Accountancy - Add binding and journal for expense reports
 2016-10-28 11:25:21 +02:00
Juanjo Menent
7acc14903c Merge pull request #5937 from atm-maxime/fix_supporder_vars_set 
Fix : vars were not set after commande function
 2016-10-28 11:18:15 +02:00
Juanjo Menent
e1ee9f8661 Merge pull request #5932 from defrance/patch-35 
bad setting on get_entity fournisseur
 2016-10-28 11:14:57 +02:00
Maxime Kohlhaas
3dbab863a7 Fix : vars were not set after commande function 2016-10-28 10:24:31 +02:00
Maxime Kohlhaas
be493fcf09 Fix bad parameter in hook call 2016-10-28 10:16:58 +02:00
aspangaro
029fa1ed8a Finishing works 2016-10-27 06:04:23 +02:00
Laurent Destailleur
54bd355800 Better help 2016-10-27 02:02:40 +02:00
Laurent Destailleur
fb0f5e3230 Better behaviour on small screen 2016-10-27 01:47:03 +02:00
BENKE Charlie
632fe49fb9 bad setting on get_entity fournisseur 2016-10-26 16:59:58 +02:00
Laurent Destailleur
0847dba26d Keep option hidden 2016-10-26 12:43:05 +02:00
Laurent Destailleur
d27ffd4194 Merge pull request #5393 from frederic34/patch-10 
NEW Add admin parameter BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDE for supplier order
 2016-10-26 11:48:02 +02:00
Laurent Destailleur
77a9eb4950 Merge pull request #5927 from IonAgorria/propal-relative 
NEW: Proposal line move when cloning with different delivery date
 2016-10-26 11:36:50 +02:00
Laurent Destailleur
d47fc281b0 Better accountancy tutorial 2016-10-26 11:15:25 +02:00
Laurent Destailleur
75695fafa6 Merge pull request #5917 from aspangaro/5.0-p31 
Accountancy - Add menu expense report accounts in configuration
 2016-10-26 11:03:00 +02:00
Laurent Destailleur
27808b7f81 Merge pull request #5915 from aspangaro/5.0-p29 
NEW Expense report documents are now available in ECM module
 2016-10-26 10:57:23 +02:00
Laurent Destailleur
ff3a14319a Merge pull request #5928 from bomuux/patch-1 
Fix: price not properly rounded, VAT inconsistencies
 2016-10-26 10:55:52 +02:00
Laurent Destailleur
1216b6f1d8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-26 10:47:57 +02:00
Laurent Destailleur
ff6f5eea6f Fix travis errors 2016-10-26 10:47:47 +02:00
florian HENRY
c37cc5b6d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_consomption_thirdparty_withmorefigures 2016-10-26 10:44:15 +02:00
Laurent Destailleur
bf0345da42 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-26 10:42:46 +02:00
Laurent Destailleur
11c4f49a15 FIX #5924 2016-10-26 10:42:34 +02:00
Laurent Destailleur
b04230e38c Merge pull request #5916 from aspangaro/5.0-p30 
War against colspan - Supplier payment card
 2016-10-26 10:41:19 +02:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
709e4b0499 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-26 10:26:43 +02:00
Laurent Destailleur
201288280d Merge pull request #5920 from simnandez/develop 
Fix: Use undeclared variable
 2016-10-26 10:22:52 +02:00
bomuux
3136895dc7 FIX: excl. tax price not properly rounded 
When adding a 'free line' product or service in a supplier invoice, the amount  excluding tax (HT) is not properly rounded, in particular when calculated from full tax price. This leads to inconsistencies in results when using large quantities or small precision in settings. Test case :
with default settings
MAIN_MAX_DECIMALS_UNIT = 5
MAIN_MAX_DECIMALS_TOT = 2
MAIN_MAX_DECIMALS_SHOWN = 8

Add in a new invoice a free product with 13.33 TTC (full tax), quantity 1, save, then edit the line with quantity 10111
Now in another invoice, add a free product with 13.33 TTC (full tax), quantity 10111, save.
Exact same data in the two invoices, but Tax and grand total are different, and false in second case because computed before rounding.

Also removed some direct access to $_POST array.
 2016-10-26 08:55:43 +02:00
aspangaro
8800bf8b25 Update works 2016-10-26 07:46:48 +02:00
aspangaro
883446c5bb Merge remote-tracking branch 'Upstream/develop' into 5.0-p32 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-10-25 22:09:40 +02:00
Laurent Destailleur
854e75513b Fix bad alias 2016-10-25 21:44:10 +02:00
Laurent Destailleur
43bf372cf7 Fix doxygen 2016-10-25 21:15:25 +02:00
Laurent Destailleur
b999b0bb82 Fix dead code 2016-10-25 21:04:49 +02:00
Laurent Destailleur
4a3251407f Fix missing cache dir 2016-10-25 20:46:21 +02:00
Laurent Destailleur
01dd8fee48 Minor enhancement 2016-10-25 20:36:22 +02:00
Laurent Destailleur
7c5ca155cb Fix error 2016-10-25 19:21:08 +02:00
Laurent Destailleur
f67863e1aa NEW Can use any filter on all REST API to list. 2016-10-25 19:15:47 +02:00
phf
3e2f39fbc0 Fix on first activate module it must create if needed the first currency rate from general settings 2016-10-25 13:31:36 +02:00
phf
a947ac55f9 Fix get multicurrency rowid from code must be filtered by entity 2016-10-25 12:45:23 +02:00
Laurent Destailleur
5d655d47fe Enhance css 2016-10-25 12:36:14 +02:00
phf
1dc0dfc065 Fix fetch multicurrency object from code must be filter by entity 2016-10-25 12:07:34 +02:00
Laurent Destailleur
6ef74b33c9 Uniformize code 2016-10-25 11:09:26 +02:00
Juanjo Menent
94a884cea8 Fix: Use undeclared variable 2016-10-25 09:45:53 +02:00
Juanjo Menent
94d1e6180e Merge remote-tracking branch 'upstream/develop' into develop 2016-10-25 09:44:54 +02:00
florian HENRY
237d04e3c0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_consomption_thirdparty_withmorefigures 2016-10-25 09:44:03 +02:00
aspangaro
6e7f104c5f Update works 2016-10-25 07:41:01 +02:00
Laurent Destailleur
384abd8462 Uniformize look and feel 2016-10-25 02:56:46 +02:00
Laurent Destailleur
7b3793c775 Fix W3C on FTP setup page 2016-10-25 02:33:40 +02:00
Laurent Destailleur
b15535c1f1 Uniformize code 2016-10-25 02:04:46 +02:00
Laurent Destailleur
eb37c72513 Uniformise code 2016-10-24 20:56:48 +02:00
Laurent Destailleur
aad4380689 Uniformise code 2016-10-24 20:52:21 +02:00
Sergio Sanchis Climent
2a4517e1bc FIX: #5907 2016-10-24 19:21:41 +02:00
Juanjo Menent
9ab25d4472 Fix: Use undeclared variable 2016-10-24 18:51:46 +02:00
Laurent Destailleur
36c2b5afcd Responsive 2016-10-24 18:43:17 +02:00
Laurent Destailleur
6bd219b117 Fix column task ref/label 2016-10-24 17:47:31 +02:00
Laurent Destailleur
bc2342e9a4 Fix bad link 2016-10-24 17:37:39 +02:00
Laurent Destailleur
f1421a2ee4 Rename constant with english name 2016-10-24 13:10:35 +02:00
Laurent Destailleur
0ae5a3799c Fix html 2016-10-24 12:42:37 +02:00
Laurent Destailleur
8222f7a78b Fix translation 2016-10-24 12:24:46 +02:00
Laurent Destailleur
3b05d00163 Better responsive design 2016-10-24 12:06:33 +02:00
Laurent Destailleur
6338b04ac0 Remove call of a deprecated function 2016-10-24 11:27:39 +02:00
florian HENRY
201e084186 style 2016-10-24 09:07:21 +02:00
florian HENRY
5dcf3033ec Merge branch 'develop' into dev_consomption_thirdparty_withmorefigures 2016-10-24 08:53:51 +02:00
florian HENRY
4c4e404dae Add unit PRice 2016-10-24 08:53:39 +02:00
aspangaro
6314df035a Work on expense report accountancy integration 2016-10-24 07:16:26 +02:00
aspangaro
dc727ebb3c Accountancy - Add binding and journal for expense reports 2016-10-24 06:41:32 +02:00
aspangaro
0d62148a0f Accountancy - Add menu expense report accounts in configuration 2016-10-24 06:27:20 +02:00
aspangaro
845c770d01 War against colspan - Supplier payment card 2016-10-24 05:53:59 +02:00
aspangaro
d0544b0aea Merge remote-tracking branch 'Upstream/develop' into 5.0-p29 2016-10-24 05:27:49 +02:00
aspangaro
337e9db046 New: Expense report documents are now available in ECM module 2016-10-24 05:26:19 +02:00
Laurent Destailleur
39bc78909b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2016-10-24 03:35:43 +02:00
Laurent Destailleur
33a7b7037d Save information of vat code into database 2016-10-24 03:23:40 +02:00
Laurent Destailleur
c976044d70 Merge pull request #5910 from aspangaro/5.0-p28 
Better presentation for member edit card
 2016-10-24 03:20:24 +02:00
Laurent Destailleur
09ef693c5f Merge pull request #5908 from openthink-laurent/add-file-scheme-allowed-uris-schemes-links 
NEW Add file:// scheme to allowed URIs schemes for links
 2016-10-24 03:19:53 +02:00
Laurent Destailleur
e4da87d31c Merge pull request #5903 from atm-gauthier/FIX_thirdparty_margin 
FIX : margin tab on customer card must filter on current entity invoices
 2016-10-24 03:18:37 +02:00
Laurent Destailleur
4e23f1adf1 Merge pull request #5902 from aspangaro/5.0-p25 
Better presentation of invoice payment page
 2016-10-24 02:43:44 +02:00
Laurent Destailleur
9560ec54cc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture/list.php
 2016-10-24 02:15:12 +02:00
Laurent Destailleur
acf8874c6a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2016-10-24 02:11:49 +02:00
Laurent Destailleur
a6c2758ca2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2016-10-24 02:10:17 +02:00
Laurent Destailleur
fdcc858008 Merge branch 'dev_resource_extrafields' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 02:05:34 +02:00
Laurent Destailleur
2f77549d2b Merge pull request #5897 from olsesacl/4-search-forun 
FIX: Search provider by price
 2016-10-24 02:04:01 +02:00
Laurent Destailleur
b1cab83af5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-24 02:02:40 +02:00
Laurent Destailleur
b284bdd953 NEW #5896 More complete data on event sent by email (name in title, 
emails list in details)
 2016-10-24 02:02:30 +02:00
Laurent Destailleur
7dd3beaa5f Merge pull request #5893 from olsesacl/task_reference 
FIX: Documents no change directory if change reference of the task.
 2016-10-24 01:12:26 +02:00
Laurent Destailleur
4e9f7c0fa8 Merge pull request #5892 from philippe-opendsi/develop 
NEW : Add create events on project card
 2016-10-24 01:11:52 +02:00
Laurent Destailleur
c8c5ce3760 Merge pull request #5890 from mrsof/patch-4 
Fix : Custom menu handler is not accessible for editing
 2016-10-24 01:09:27 +02:00
Laurent Destailleur
b5b76dfaf7 Merge pull request #5889 from atm-gauthier/NEW_filter_socid_on_find_min_price_product_fournisseur 
FIX param socid so find_min_price_product_fournisseur() use correct thirdparty when we create supplierorder from supplierproposal
 2016-10-24 01:06:15 +02:00
Laurent Destailleur
8340316141 Merge pull request #5888 from olsesacl/trigger_expedition 
Fix: Need declare $user for call trigger
 2016-10-24 01:01:54 +02:00
Laurent Destailleur
024c0501bf Merge pull request #5885 from GPCsolutions/develop-members-types 
Add deprecated property explicitly
 2016-10-24 00:59:39 +02:00
Laurent Destailleur
3c3c5d06a1 Merge branch 'NEW_parent_warehouse' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_parent_warehouse

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 00:58:02 +02:00
Laurent Destailleur
8e8506968f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-24 00:45:09 +02:00
Laurent Destailleur
0b63f89e3a Merge branch 'NEW_customerorders_to_bill' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_customerorders_to_bill

Conflicts:
	htdocs/langs/en_US/bills.lang
 2016-10-24 00:44:37 +02:00
Laurent Destailleur
e388feee07 Merge pull request #5771 from defrance/patch-28 
Add update_total function (like on other element)
 2016-10-24 00:41:27 +02:00
Laurent Destailleur
468ff6795a Merge pull request #5827 from aspangaro/5.0-p20 
Work on supplier type (Replacement / deposit / credit note) invoice
 2016-10-24 00:38:32 +02:00