lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
54,203 Commits 43 Branches 150 Tags 886 MiB
4382f2a437
Commit Graph

6217 Commits

Author SHA1 Message Date
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
Raphaël Doursenaud
eb54c3f8af
Fix #5350 date_pointoftax prevented creating invoices 2016-06-16 13:09:11 +02:00
Laurent Destailleur
232f525f29 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2016-06-15 18:31:43 +02:00
Laurent Destailleur
4c922f073b FIX Can't create thirdparty or validate invoice if profid is mandatory 
and profid does not exists for other countries
 2016-06-15 18:21:58 +02:00
Laurent Destailleur
44503cb43c Fix missing "back to list" link 2016-06-14 20:49:34 +02:00
Laurent Destailleur
6034ba658c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-10 18:59:05 +02:00
Laurent Destailleur
fd4973c413 Fix missing total 2016-06-09 07:50:54 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
ad001ed4dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-07 14:06:17 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
18f1ee1685 Merge pull request #5316 from atm-gauthier/develop_fix_deplacement_list 
FIX : if user is only allowed to see his companies, he must be allowe…
 2016-06-07 00:43:17 +02:00
Laurent Destailleur
a8541fcaeb Merge pull request #5315 from atm-gauthier/develop_fix_usercard_link_on_deplacement 
FIX : wrong id user deplacement links
 2016-06-07 00:27:08 +02:00
Laurent Destailleur
559c1aa010 Fix alignetment of title in some arrays 2016-06-06 16:37:18 +02:00
Laurent Destailleur
fb13225173 Fix links on list from warnings dashboard 2016-06-06 16:31:50 +02:00
gauthier
07d07d522a FIX : if user is only allowed to see his companies, he must be allowed to see deplacement which are not linked to a company 2016-06-06 16:31:42 +02:00
gauthier
b153ae8c6b FIX : wrong id user deplacement links 2016-06-06 16:12:27 +02:00
Laurent Destailleur
47308d27c3 Missing column import_key and import for vat payments 2016-06-06 14:37:06 +02:00
Laurent Destailleur
4416925a85 Merge pull request #5314 from fmarcet/peru 
Fix: Missing userid on query
 2016-06-06 13:40:20 +02:00
Laurent Destailleur
293534273f Merge pull request #5313 from aspangaro/4.0-p33 
Fix: colspan in vat list of payments
 2016-06-06 13:39:07 +02:00
Your Name
68fa27ec03 Fix: Missing userid on query 2016-06-06 12:00:24 +02:00
Laurent Destailleur
9c88eadbe4 Fix: button to generate invoice manually must be disabled if we reach 
max number of generation.
 2016-06-06 11:48:39 +02:00
Laurent Destailleur
a0458be943 Fix object not defined 2016-06-06 11:25:54 +02:00
aspangaro
3b3567a718 Fix: colspan 2016-06-05 15:50:32 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:25:08 +02:00
Laurent Destailleur
c59c86e648 Merge branch 'develop' of https://github.com/aschio/dolibarr into 
develop

Conflicts:
	htdocs/fourn/facture/list.php
 2016-06-04 14:55:02 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
Laurent Destailleur
674164b71c Add a better explanation on job generation 2016-06-04 14:30:05 +02:00
Laurent Destailleur
975d9357fa FIX On recurring invoice, when generation is done manually from card, 
counter of number of generation must be +1
 2016-06-04 14:08:57 +02:00
Juanjo Menent
43d475aa42 Merge pull request #5272 from simnandez/3.9 
Fix issues with strict mode
 2016-06-04 10:07:01 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
Juanjo Menent
66c73015b2 Fix issues with strict mode 2016-06-03 23:58:54 +02:00
Laurent Destailleur
448c394f2a Fix date of recurrin invoice 2016-06-03 22:10:33 +02:00
Laurent Destailleur
a5d7c303e7 FIX Button must be out of tabs 2016-06-02 21:11:14 +02:00
Laurent Destailleur
028ff5e84c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/langs/en_US/products.lang
	htdocs/societe/list.php
 2016-06-01 17:59:50 +02:00
Laurent Destailleur
7519c4a602 FIX Log of tax 
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
 2016-06-01 13:24:27 +02:00
Laurent Destailleur
460d7ce915 FIX Split of credit note into discount page generates records not 
correctly recognised as credit note.
 2016-05-30 19:38:28 +02:00
Laurent Destailleur
2dcc578b88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-30 00:52:59 +02:00
Laurent Destailleur
3ddf427ff1 FIX Legal issue for GB. Add hidden option for this. 2016-05-30 00:52:16 +02:00
Laurent Destailleur
0c6e8b626a Fix var not initialized 2016-05-29 11:20:27 +02:00
gauthier
71ee941cf8 FIX : SQL error function on getAvailableDiscounts function, on bill create mode if socid is empty 2016-05-25 12:25:39 +02:00
Laurent Destailleur
3abe1d8e81 Merge pull request #5220 from fmarcet/expenses 
The approved status is enough to expense appear in the report
 2016-05-22 14:22:38 +02:00
Laurent Destailleur
7935967c62 Fix duplicate translation key 2016-05-21 12:30:58 +02:00
Your Name
106f456c6b Last change 2016-05-19 16:50:18 +02:00
Laurent Destailleur
400572e18a Fix column size 2016-05-18 21:04:37 +02:00
Laurent Destailleur
4c2098b667 Fix duplicate table title 2016-05-18 20:58:29 +02:00
Laurent Destailleur
7cca4f3e8a Merge pull request #5211 from defrance/patch-4 
enhance rappro feature
 2016-05-18 20:38:07 +02:00
Your Name
c2b958a039 Correction compatibility Postgresql 2016-05-18 18:52:38 +02:00
Your Name
23311cdba1 Merge remote-tracking branch 'origin/develop' into expenses 2016-05-18 18:46:05 +02:00