lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,903 Commits 43 Branches 150 Tags 886 MiB
69c1de3fe1
Commit Graph

5138 Commits

Author SHA1 Message Date
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Frédéric FRANCE
37e5a97f84 Typo 2014-12-09 23:07:41 +01:00
Laurent Destailleur
63f2bfed24 Fixed: Maxi debug of withdrawal module. 2014-12-09 11:19:16 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/projet/tasks/task.php
 2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Frédéric FRANCE
650d4a3da9 Fix missing /form 2014-12-02 19:55:10 +01:00
Laurent Destailleur
c8e1c2bff4 Merge pull request #2113 from frederic34/patch-3 
Fix missing /form
 2014-12-02 19:54:46 +01:00
Laurent Destailleur
01209ff844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/card.php
 2014-11-30 14:15:38 +01:00
Laurent Destailleur
b9ea7d4d13 Fix: Stock decrease from POS 2014-11-29 17:38:12 +01:00
Frédéric FRANCE
bff209a895 Fix missing /form 2014-11-28 08:25:51 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/main.inc.php
 2014-11-28 02:26:40 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
 2014-11-28 02:20:01 +01:00
Laurent Destailleur
d9cb9c1585 Merge pull request #2102 from aspangaro/develop-center 
Task 1603 - Remove <center> deprecated HTML5 tags
 2014-11-27 23:58:44 +01:00
Frédéric FRANCE
bc58641828 Update Invoice Preview to be like order and propal preview 2014-11-27 22:07:18 +01:00
Laurent Destailleur
60e5369db2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/bookmarks/card.php
 2014-11-27 22:01:02 +01:00
Frédéric FRANCE
755732ce58 Update apercu.php 2014-11-26 20:35:08 +01:00
Frédéric FRANCE
96e0ecd1a7 Update Invoice Preview 2014-11-26 20:07:47 +01:00
Francis Appels
b1a4b8e7d0 Fix: [ bug #1624 ] POS set buy price for margin 
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
 2014-11-25 21:20:13 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Frédéric FRANCE
fbdd851875 Fix remove </a> not needed 2014-11-25 18:54:56 +01:00
Laurent Destailleur
6d2e024d52 Doxygen 2014-11-23 17:53:44 +01:00
Laurent Destailleur
3f655154c5 Merge pull request #2083 from frederic34/patch-2 
Fix Typo
 2014-11-23 17:47:43 +01:00
Frédéric FRANCE
979d6dffa2 Update /compta/paiement/cheque/list.php 2014-11-23 17:45:18 +01:00
Frédéric FRANCE
339415034e Update /compta/facture/impayees.php 2014-11-23 17:44:45 +01:00
Frédéric FRANCE
ccff0f0952 Update /compta/facture/list.php 2014-11-23 17:44:41 +01:00
Frédéric FRANCE
9b731753e7 Update /compta/salaries/index.php 2014-11-23 17:44:37 +01:00
Frédéric FRANCE
fa89e310ae Update /compta/paiement/list.php 2014-11-23 17:44:33 +01:00
Frédéric FRANCE
dd1c39b44e Update /compta/bank/search.php 2014-11-23 17:44:29 +01:00
Frédéric FRANCE
2a79c2c826 Update /compta/sociales/index.php 2014-11-23 17:44:25 +01:00
Frédéric FRANCE
59494db8c1 Update /compta/tva/reglement.php 2014-11-23 17:44:21 +01:00
Frédéric FRANCE
8c839cc2a1 Update /compta/prelevement/list.php 2014-11-23 17:44:16 +01:00
Frédéric FRANCE
68ccb33def Update /compta/deplacement/list.php 2014-11-23 17:44:13 +01:00
Frédéric FRANCE
045c2f9568 Update /compta/dons/list.php 2014-11-23 17:44:08 +01:00
Frédéric FRANCE
326e009cad Fix Typo 2014-11-23 17:42:06 +01:00
Laurent Destailleur
652b0f84a7 Fixed: Field is used only by module accounting so must have a condition 
on it.
 2014-11-23 17:03:22 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer 
Fixed: Solve conflict between ->iban and ->iban_prefix.
 2014-11-22 16:57:08 +01:00
Laurent Destailleur
d8767bfbae Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/class/product.class.php
 2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-22 16:03:09 +01:00
Laurent Destailleur
eaa4b6cb56 Add PR manually because of conflict "#1678 & #1677 Untranslatable token" 2014-11-22 15:37:18 +01:00
Laurent Destailleur
d6f47227fe Fixed: [ bug #1646 ] Can't list unpaid invoices 2014-11-22 15:09:54 +01:00
Laurent Destailleur
5acdce0b9f Fixed: [ bug #1647 ] Can't list tax payments 2014-11-21 23:52:12 +01:00
Laurent Destailleur
ce98036725 Fixed: [ bug #1648 ] Can't see turnover report by product/services 2014-11-21 23:45:56 +01:00
Laurent Destailleur
80e62697f0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/bank/treso.php
 2014-11-18 19:01:01 +01:00
Laurent Destailleur
01279edfc8 Fixed: [ bug #1570 ] Negative supplier invoices do not appear in bank 
planned transactions.
 2014-11-16 16:36:32 +01:00
Laurent Destailleur
c186f13218 Fix: Param $action was not defined. 
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
 2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Christophe Battarel
7ed496d7d9 FIX: copy extrafields when creating order from propale and creating 
invoice from order
 2014-11-12 17:51:26 +01:00
Laurent Destailleur
29298c73b9 Fix: Must show limit into list 2014-11-09 19:16:22 +01:00
Laurent Destailleur
6fd89c4b41 Fix: Missing translation 2014-11-08 20:05:56 +01:00