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

62523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0cf67944fa Clean code 2017-09-16 13:14:46 +02:00
Laurent Destailleur
9077b5f374 Translation 2017-09-16 12:48:51 +02:00
Laurent Destailleur
279988bd60 Remove warning 2017-09-16 12:45:54 +02:00
Laurent Destailleur
ad40d27324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2017-09-16 12:22:18 +02:00
Laurent Destailleur
ff7a17eb96 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2017-09-16 12:17:30 +02:00
Laurent Destailleur
5bb4590348 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-09-16 12:12:18 +02:00
Laurent Destailleur
e4767b1a51 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/fiche-rec.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2017-09-16 12:11:18 +02:00
Regis Houssin
9653280be9 New: big refactorization and uniformize code 2017-09-16 10:54:20 +02:00
Laurent Destailleur
b099e0a135 Fix translation of dolistore interface 2017-09-16 10:42:23 +02:00
Laurent Destailleur
695c231e78 Update code comment 2017-09-16 10:26:27 +02:00
Laurent Destailleur
bd7c4fe940 NEW Summary of last events on a card are sorted on decreasing date. 2017-09-16 10:12:44 +02:00
Ahmad M. Zawawi
5fd7cdff5c Fix example comment typo 2017-09-16 10:53:16 +03:00
Laurent Destailleur
058b690e25 FIX menu enty when url is external link 2017-09-16 09:22:52 +02:00
Laurent Destailleur
8986640a10 FIX Responsive 2017-09-16 09:16:05 +02:00
Laurent Destailleur
4e7e6cc658 Fix W3C 2017-09-16 09:15:10 +02:00
Laurent Destailleur
baa32f6ed8 FIX Responsive 2017-09-16 09:13:57 +02:00
Alexandre SPANGARO
c2e1e2491d Accountancy - Finish moving admin to specific menu & some cleaning 2017-09-16 06:53:29 +02:00
Laurent Destailleur
a6b600c8a1 Fix regression in unit tests 2017-09-16 03:54:23 +02:00
Laurent Destailleur
961d475a9d More complete substitution system. 
Add __CONTRACT_NEXT_EXPIRATION_DATE__  and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
 2017-09-16 03:45:29 +02:00
Laurent Destailleur
5e4b500b5d Fix signature was changed during insert 2017-09-16 02:22:55 +02:00
Laurent Destailleur
a4086b52ef NEW Can send email from contract card 2017-09-16 01:34:15 +02:00
Laurent Destailleur
bb6b3db0ac FIX Position of signature on strato template 
Conflicts:
	htdocs/core/modules/contract/doc/pdf_strato.modules.php
 2017-09-16 00:50:54 +02:00
Laurent Destailleur
b13dbf1f06 Clean code. Make selection of template working even if public. 2017-09-16 00:49:46 +02:00
Laurent Destailleur
f4de75afc3 FIX Position of signature on strato template 2017-09-16 00:49:00 +02:00
Laurent Destailleur
087e22ab94 Fix bad status picto 2017-09-16 00:14:39 +02:00
Laurent Destailleur
8773a6860f Fix HTML5 use of <br> is preferred to <br /> 2017-09-15 23:49:04 +02:00
Laurent Destailleur
ffb3823655 Allow null in stock alert threshold to be compatible with #7162 2017-09-15 23:38:03 +02:00
Laurent Destailleur
a8b4d216e5 Fix PHPCS 2017-09-15 23:21:42 +02:00
Rui Strecht
39341f0095 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-15 18:52:14 +01:00
Laurent Destailleur
3c9532841f Fix regression db => this->db 2017-09-15 19:37:23 +02:00
Rui Strecht
36e634ae4c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-15 18:34:25 +01:00
Rui Strecht
33d00d508e Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into develop 2017-09-15 18:32:03 +01:00
Laurent Destailleur
ac1d701d6f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 19:22:24 +02:00
Laurent Destailleur
5fc255075e Merge pull request #7413 from hregis/develop_trad 
Fix: translation
 2017-09-15 19:21:51 +02:00
Laurent Destailleur
48ae76e295 Fix picto on service 2017-09-15 19:13:40 +02:00
Laurent Destailleur
89993e0f3f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 19:09:02 +02:00
Laurent Destailleur
55e31796d2 Code comment 2017-09-15 19:08:39 +02:00
Laurent Destailleur
2fcedcad74 Merge pull request #7410 from atm-florian/dev_better_propal_singend_form 
NEW: confirm form style to accept or reject proposal
 2017-09-15 18:58:25 +02:00
Laurent Destailleur
b63b0933e7 Update card.php 2017-09-15 18:57:39 +02:00
Laurent Destailleur
7b8699f54c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-15 18:56:30 +02:00
Laurent Destailleur
9d9d5d6dc8 Merge pull request #7399 from ptibogxiv/develop 
FIX multicompany
 2017-09-15 18:55:29 +02:00
Laurent Destailleur
59f644a3e2 FIX SEPA recording payment must save one payment in bank per customer 2017-09-15 18:39:10 +02:00
Regis Houssin
767240698f Fix: wrong var name 2017-09-15 18:31:22 +02:00
Regis Houssin
3ca90df524 Fix: translation 2017-09-15 18:21:50 +02:00
Regis Houssin
7f57f737b3 New: Ping ldap server before ldap_connect for avoid waiting 2017-09-15 18:02:52 +02:00
Regis Houssin
cbd8cb8cb7 Fix: missing merge conflict 2017-09-15 17:32:49 +02:00
Laurent Destailleur
17eec5f9e9 Fix look and field for direct debit notes 2017-09-15 17:23:41 +02:00
Regis Houssin
db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/class/paymentterm.class.php
 2017-09-15 16:45:49 +02:00
Laurent Destailleur
88397436c0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 16:41:24 +02:00
Laurent Destailleur
a0e5868fd9 Fix typo 2017-09-15 16:41:10 +02:00