Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 10:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
65,163 Commits 36 Branches 191 Tags
40d04482b030e4b697e23fcb51e37b00f7b2d47b
Commit Graph

493 Commits

Author SHA1 Message Date
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
1ee128ff13 NEW Add type of website container/page into dictionary 2018-02-19 19:48:53 +01:00
Laurent Destailleur
28417a6c24 Fix css 2018-01-26 23:54:45 +01:00
Laurent Destailleur
98b82d712a NEW Revenue stamp can be a percent 
FIX Revenue stamp not visible on the transfer payment page
 2017-12-18 12:43:03 +01:00
Laurent Destailleur
8954d52e32 Fix edit dictionary 2017-11-27 16:07:48 +01:00
Laurent Destailleur
fa92c53ff6 Fix pb when showing dictionaries 2017-11-14 11:13:24 +01:00
Maxime Kohlhaas
82ea46c740 New dictionnaries are now pre-filtered on company country 2017-11-07 10:49:04 +01:00
Philippe GRAND
acc69b1f80 fix : Warning: A non-numeric value encountered 2017-11-03 19:52:02 +01:00
Laurent Destailleur
801a5180d6 Fix scrutinizer bug reports 2017-10-06 01:16:19 +02:00
Regis Houssin
a38668033d Fix: missing modification 2017-09-27 17:46:17 +02:00
Regis Houssin
20684b4505 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/rapport/pdf_paiement.class.php
	htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
 2017-09-27 17:22:18 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
cef7b9c92d FIX #7435 Can't add payment term 2017-09-25 00:08:26 +02:00
Regis Houssin
a03ef95eaa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/tables/llx_c_payment_term.sql
 2017-09-18 09:11:04 +02:00
Laurent Destailleur
8773a6860f Fix HTML5 use of <br> is preferred to <br /> 2017-09-15 23:49:04 +02:00
Regis Houssin
a494e01f00 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-14 12:07:19 +02:00
Laurent Destailleur
a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php
 2017-09-12 13:26:25 +02:00
Regis Houssin
b5de8da3a6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/modFacture.class.php
 2017-09-11 08:07:55 +02:00
Laurent Destailleur
e9e6a8e5ad Fix center of button 2017-09-11 03:29:36 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
7dbd0bd355 FIX Some page of admin were not responsive 2017-09-08 10:09:22 +02:00
Regis Houssin
66e548427c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/resultat/clientfourn.php
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-07 10:50:35 +02:00
Laurent Destailleur
f29a4c1fb1 Make accountancy pages responsive 2017-09-05 20:42:34 +02:00
Regis Houssin
0dc0fe81fc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-31 07:40:01 +02:00
atm-ph
1f3f9e40b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-27 16:01:53 +02:00
Regis Houssin
2efb86b5d8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-23 10:36:14 +02:00
Laurent Destailleur
5207b84e8b Fix compatibility with indian IGST/CSGST/SGST 2017-07-22 01:56:38 +02:00
Regis Houssin
cb6b81d897 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-11 19:10:22 +02:00
phf
6ab0ec4b1b Fix travis and rename 2 fields 2017-07-07 10:22:37 +02:00
phf
b8865c425f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-05 10:48:01 +02:00
phf
1beec51928 New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE 2017-07-05 10:44:52 +02:00
Regis Houssin
d9d9b748ad Fix: check if action type is different of 'user' (external module) 2017-07-03 19:27:21 +02:00
Regis Houssin
fa247ffd98 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-29 08:51:42 +02:00
Juan Bautista Mesa Roldán
0f5dc90bae Fixing pages warning when value is null 2017-06-24 16:45:45 +02:00
Regis Houssin
544d051fe3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-19 07:06:57 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Regis Houssin
a0299042e4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-17 12:05:33 +02:00
Laurent Destailleur
8149bf62a8 Fix ajaxcombo broken on accouting account edition on vat dictionary. 2017-06-15 23:47:19 +02:00
Regis Houssin
773abff80e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-12 21:24:10 +02:00
Laurent Destailleur
58c4144123 Fix sort of dictionnary 2017-06-11 19:27:07 +02:00
Regis Houssin
3445c9d329 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/lib/functions.lib.php
 2017-06-11 06:27:49 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Regis Houssin
0546f28823 Fix: Travis error 2017-06-08 18:38:24 +02:00
Regis Houssin
73557151d2 Fix: better test if entity equal 0 2017-06-08 18:27:32 +02:00
Regis Houssin
3bddbd3bdf Fix: better test 2017-06-08 18:20:27 +02:00
Regis Houssin
ade915af5f New: add dictionnary sharing (multicompany) 2017-06-08 16:36:42 +02:00
Regis Houssin
1baa620688 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-08 10:33:26 +02:00
Regis Houssin
44dba391c1 New: add dictionnary sharing (multicompany) 2017-06-08 10:24:16 +02:00
Regis Houssin
2b36135641 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00