Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 03:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,916 Commits 36 Branches 190 Tags
c72e7e6a973bcb58ffb51a22944b68f371769bc0
Commit Graph

9016 Commits

Author SHA1 Message Date
Laurent Destailleur
ab3365440c Fix translation 2019-01-13 16:51:34 +01:00
Laurent Destailleur
653acf556b Fix translation Customer order into Sales order 2019-01-10 12:15:42 +01:00
Laurent Destailleur
22d4afbb62 Missing trans 2019-01-10 01:54:06 +01:00
Laurent Destailleur
126e02798a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/fr_FR/cashdesk.lang
 2019-01-07 19:49:15 +01:00
Laurent Destailleur
1188540b41 Sync transifex 2019-01-07 19:39:41 +01:00
Laurent Destailleur
527ef8bdc8 Add nb of invoice to help cash fence 2019-01-07 19:02:38 +01:00
Laurent Destailleur
1403ac3cc1 Trans 2019-01-07 18:07:56 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
 2019-01-04 19:36:20 +01:00
ldestailleur
cf84fdf7c7 Translate option "Simplify interface for blind persons" 2019-01-03 20:07:58 +01:00
ldestailleur
1b19f5153b Fix cash fence feature 2019-01-03 14:18:02 +01:00
ldestailleur
dbbfdd984a Fix emailcollector can't be used without syntax rules 2019-01-03 11:47:27 +01:00
Laurent Destailleur
08b1e67e5c Merge pull request #10275 from aspangaro/10.0_accountancy_member 
NEW: Accountancy - Add default accounting account for member subcription
 2019-01-02 19:51:30 +01:00
andreubisquerra
8dee9de8f5 Add header and footer to TakePOS receipt 2018-12-30 22:20:55 +01:00
Alexandre SPANGARO
a2075b9d2c V9 look & Feel, etc 2018-12-30 20:32:44 +01:00
Alexandre SPANGARO
41c7af590d NEW: Accountancy - Add default accounting account for member subcriptions 2018-12-29 22:11:24 +01:00
Laurent Destailleur
afac151793 Merge pull request #10261 from torvista/import 
Changes for csv import of Third Parties and Products
 2018-12-22 18:40:37 +01:00
Laurent Destailleur
20f6f8887a Fix typo 2018-12-22 18:40:00 +01:00
Laurent Destailleur
4ae88642ec Fix typo 2018-12-22 18:35:51 +01:00
Laurent Destailleur
a997001dbf Fix typo 2018-12-22 18:34:48 +01:00
Laurent Destailleur
78460d2f60 Merge pull request #10257 from torvista/langs-en_US 
langs-en_US
 2018-12-22 18:33:37 +01:00
Laurent Destailleur
3d509910dd Merge branch 'develop' into master 2018-12-22 18:24:23 +01:00
Laurent Destailleur
afee39ea68 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 12:09:27 +01:00
Laurent Destailleur
4859d944d8 Sync transifex 2018-12-21 12:09:03 +01:00
Laurent Destailleur
391f916bd5 Fix trans 2018-12-21 10:21:56 +01:00
Laurent Destailleur
ae6596cac7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 09:57:29 +01:00
torvista
2ff35895b6 minor improvements 
new constants for missing direct debit terms
 2018-12-20 23:36:35 +01:00
Steve
70c0adc3d1 import.php 
HTML5 validation
ADDED htmlentities to enclosure and separator
CHANGED td aligns to css, removed nospan tag
ADDED clause to box generator to stop multiple duplicate ids when no $key
REMOVED height attribute
REMOVED nested b tag
CHANGED deprecated Center tag for div style center
FIX
Added check
if ($objimport->array_import_updatekeys[0] && count($objimport->array_import_updatekeys[0]
to stop php warning
------------------
modProduct.class.php
Products Import
ordered fields as per table structure order
ADDED and changed import fields and examples
------------------
modSociete.class.php
Third Party Import
Changed field orders to match table field order so future additions will be easier to manage.
REMOVED s.datec repeated in import example
ADDED: alias, payment mode, payment conditions, sales tax VAT, multicurrency, currency
Additional Address Import
Changed field orders to match table field order
import example csv was missing birthday
Bank Account Import
Changed field orders to match table field order
ADDED label (required for a bank account
ADDED datec (required for d.debit UMR)
ADDED to address import: s.fk_departement
modified text to import example csv
-------------------
companies.lang
various new constants for import file column headers
 2018-12-20 16:49:17 +01:00
torvista
54436f72c7 minor improvements 2018-12-20 13:38:49 +01:00
andreubisquerra
c4be1b141d Temporary ticket improvement in TakePOS 2018-12-19 22:52:16 +01:00
torvista
9f9a468f6a more fine tuning 2018-12-19 16:22:27 +01:00
Laurent Destailleur
b0652494b5 Debug cash fence 2018-12-19 15:40:01 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
 2018-12-18 21:55:14 +01:00
Laurent Destailleur
c3eb131054 Debug ticket module 2018-12-18 13:30:22 +01:00
Laurent Destailleur
48162db33d FIX Rename of image file lose the thumbs 2018-12-17 20:19:11 +01:00
Laurent Destailleur
623afd1020 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-12-17 18:50:06 +01:00
Laurent Destailleur
ffaff4dc7f Debug website module 2018-12-17 17:29:04 +01:00
Laurent Destailleur
e014fdc20b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 11:43:02 +01:00
Laurent Destailleur
e06b06c788 Work on cash fence 2018-12-17 10:37:56 +01:00
Laurent Destailleur
cbb5e3bbe9 Better translation 2018-12-17 03:31:20 +01:00
Laurent Destailleur
af4405c669 FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE 2018-12-16 20:29:08 +01:00
Laurent Destailleur
9ce07b9582 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-12-16 15:36:18 +01:00
Laurent Destailleur
988ba172ae Clean code of POS modules 2018-12-16 14:59:51 +01:00
Juanjo Menent
6ce0d3e279 FIX: Vendor translations are in english 2018-12-16 11:16:12 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
 2018-12-15 20:00:31 +01:00
Laurent Destailleur
a601859985 Work on cash fence 2018-12-15 19:58:43 +01:00
Laurent Destailleur
0451eb741b Work on legal cash fence 2018-12-15 19:20:30 +01:00
Laurent Destailleur
54ffba793f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
	htdocs/langs/en_US/admin.lang
 2018-12-15 18:21:37 +01:00
Laurent Destailleur
944f9ac894 Typo 2018-12-15 18:14:08 +01:00
Laurent Destailleur
527ad04ae8 FIX Mandatory field feature should works on textarea 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-12-15 18:13:30 +01:00