Laurent Destailleur
4247038d01
Add phpunit test
2017-10-22 13:06:27 +02:00
Laurent Destailleur
83c1928034
Fix duplicate methods
2017-10-22 12:21:44 +02:00
Laurent Destailleur
cb4d863e83
Fix phpunit
2017-10-22 04:34:28 +02:00
Laurent Destailleur
a8443e1614
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-22 04:23:51 +02:00
Laurent Destailleur
4a1834ee29
#7411
2017-10-22 04:23:17 +02:00
Laurent Destailleur
d3f2e19691
Merge pull request #7680 from Nicos-git/OdtGeneration
...
NEW Add product unit fields for ODT substitution
2017-10-22 04:14:17 +02:00
Laurent Destailleur
ba2dd953b4
Update commondocgenerator.class.php
2017-10-22 04:13:49 +02:00
Laurent Destailleur
764e215ca1
Update commondocgenerator.class.php
2017-10-22 04:12:46 +02:00
Laurent Destailleur
b9c0ea3691
Update commondocgenerator.class.php
2017-10-22 04:07:54 +02:00
Laurent Destailleur
c9fceaad3c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/index.php
htdocs/fourn/facture/card.php
2017-10-22 04:04:26 +02:00
Laurent Destailleur
5984222794
FIX #7679
2017-10-22 03:47:36 +02:00
Laurent Destailleur
6b0d060289
Merge pull request #7677 from frederic34/stockinvoice
...
stock on supplier invoice back to draft
2017-10-22 03:33:11 +02:00
Laurent Destailleur
4325363084
Merge pull request #7676 from frederic34/patch-2
...
FIX #7675
2017-10-22 03:25:22 +02:00
Laurent Destailleur
fb843430bf
FIX #7671
2017-10-22 03:22:31 +02:00
Laurent Destailleur
6bd0550bdd
Remove rowid into script. Must use the autoincrement.
2017-10-22 02:58:31 +02:00
Laurent Destailleur
76d0549682
Merge pull request #7668 from simnandez/develop
...
NEW: Add Chile accounting plan
2017-10-22 02:53:35 +02:00
Laurent Destailleur
9c59b63343
Merge pull request #7667 from mistraloz/patch-1
...
Fix Error Column 'date_m' cannot be null
2017-10-22 02:45:02 +02:00
Laurent Destailleur
fb13419de8
Merge pull request #7665 from dolibarr95/patch-26
...
Fix: missing logo in SQL and $companystatic
2017-10-22 02:43:19 +02:00
Laurent Destailleur
030cea6a0f
Merge pull request #7664 from frederic34/patch-1
...
keep vat input with multiprices product creation
2017-10-22 02:42:44 +02:00
Laurent Destailleur
16c212c9fd
Merge pull request #7662 from atm-florian/6.0
...
fix displaying accountancy code
2017-10-22 02:32:01 +02:00
Laurent Destailleur
605c9c45e4
Merge pull request #7656 from atm-maxime/fix_accounting_mode
...
Fix #7584
2017-10-22 02:21:53 +02:00
Laurent Destailleur
4c58e4f98a
Update compta.php
2017-10-22 02:21:34 +02:00
Laurent Destailleur
210fb5206c
Update index.php
2017-10-22 02:21:04 +02:00
Laurent Destailleur
f4db4373ea
Update defaultaccounts.php
2017-10-22 02:20:29 +02:00
Laurent Destailleur
728e36f70f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
2017-10-22 01:43:33 +02:00
Laurent Destailleur
1afbf75cbc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/index.php
2017-10-22 01:30:25 +02:00
Laurent Destailleur
da8fe06301
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-10-22 01:26:17 +02:00
Laurent Destailleur
cad44ee68a
FIX substitution in ODT of thirdparties documents
2017-10-22 01:25:59 +02:00
Nicolas Leichtle
fc2a834e41
New Add product unit fields for ODT substitution
2017-10-21 23:54:49 +02:00
Laurent Destailleur
99b88265d3
Fix larger select2 combo
2017-10-21 21:05:00 +02:00
Frédéric FRANCE
8baad70f6c
stock on supplier invoice back to draft
2017-10-21 20:26:32 +02:00
Laurent Destailleur
475db3172a
NEW Remove js library fileupload that was not used by core code.
2017-10-21 19:40:17 +02:00
Laurent Destailleur
dbcf3ddbe8
NEW Upgrade jquery select2 to 4.0.4
2017-10-21 19:05:24 +02:00
Frédéric FRANCE
735f06fd83
FIX #7675
2017-10-21 16:20:06 +02:00
Juanjo Menent
b8c2c1a907
Merge remote-tracking branch 'upstream/develop' into develop
2017-10-21 14:58:52 +02:00
Laurent Destailleur
270bd13f55
FIX Error when adding a bookmark after using an external GET bookmark
2017-10-21 14:52:58 +02:00
Laurent Destailleur
1426737a26
Work on website
2017-10-21 12:26:14 +02:00
Laurent Destailleur
e74aae18eb
CSS
2017-10-21 12:25:51 +02:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Laurent Destailleur
3bca0ad07d
More modern picto for switch on/off
...
Work on website module
2017-10-20 21:39:19 +02:00
Juanjo Menent
f18980a209
NEW: Add Chile accounting plan
2017-10-20 19:02:04 +02:00
Juanjo Menent
c54d1eee1c
Merge remote-tracking branch 'upstream/develop' into develop
2017-10-20 19:00:25 +02:00
Laurent Destailleur
0e397b3e81
Work on website module
2017-10-20 18:44:03 +02:00
Laurent Destailleur
ab4f5a3aea
Clean code
2017-10-20 18:15:43 +02:00
Laurent Destailleur
985675d680
Clean code
2017-10-20 18:04:46 +02:00
Laurent Destailleur
5c189449e1
Move default value for user expense report on tab expense report
2017-10-20 17:02:26 +02:00
Laurent Destailleur
6165bcdbd0
NEW Can export list of stock movements
2017-10-20 14:52:01 +02:00
Juanjo Menent
47b1cf5a91
NEW: Add Chile accounting plan
2017-10-20 11:55:47 +02:00
mistraloz
649d958204
Fix Error Column 'date_m' cannot be null
...
Dans un document (facture, devis, ...), dans l'onglet document, si on s'y rend alors que le document n'existe pas encore, il est créé en base.
Pour une raison que je ne comprends pas bien, date_m est inseré en base s'il est défini et différent de 0, or il est initialisé à '' (vide). Il est donc inseré et non conforme au MCD.
Faut d'avoir l'historique sur l'évolution de ce module, j'ai trouvé plus simple d'initialiser date_m à la date actuelle lors de sa création. A voir si c'est ou non la meilleure solution.
2017-10-20 11:48:20 +02:00
Juanjo Menent
6137a17fa6
NEW: Add Chile accounting plan
2017-10-20 10:56:58 +02:00
